fix: Avoid patching compat functions

Author: jcs090218

lisp/core/compile.el

@@ -22,7 +22,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Handle options

lisp/create/elpa.el

@@ -30,7 +30,7 @@
       (goto-char (point-min))
       (search-forward "(script ")
       (forward-line 1)
-      (dolist (gitkeeps (directory-files-recursively eask-file-root ".gitkeep"))
+      (dolist (gitkeeps (eask-directory-files-recursively eask-file-root ".gitkeep"))
         (ignore-errors (delete-file gitkeeps)))
       ;; --- Start insertion
       (insert "(script \"build\" \"eask exec github-elpa build\")\n")

lisp/extern/compat.el

@@ -2,53 +2,51 @@
 ;;; Commentary:
 ;;; Code:
 
-(eask-defvc< 27
-  (defun directory-files-recursively (dir regexp
+;; XXX: Support after Emacs 27.1
+(defun eask-directory-files-recursively ( dir regexp
                                           &optional include-directories predicate
                                           follow-symlinks)
-    "..."
-    (let* ((result nil)
-           (files nil)
-           (dir (directory-file-name dir))
-           ;; When DIR is "/", remote file names like "/method:" could
-           ;; also be offered.  We shall suppress them.
-           (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir)))))
-      (dolist (file (sort (file-name-all-completions "" dir)
-                          'string<))
-        (unless (member file '("./" "../"))
-          (if (directory-name-p file)
-              (let* ((leaf (substring file 0 (1- (length file))))
-                     (full-file (concat dir "/" leaf)))
-                ;; Don't follow symlinks to other directories.
-                (when (and (or (not (file-symlink-p full-file))
-                               (and (file-symlink-p full-file)
-                                    follow-symlinks))
-                           ;; Allow filtering subdirectories.
-                           (or (eq predicate nil)
-                               (eq predicate t)
-                               (funcall predicate full-file)))
-                  (let ((sub-files
-                         (if (eq predicate t)
-                             (ignore-error file-error
-                               (directory-files-recursively
-                                full-file regexp include-directories
-                                predicate follow-symlinks))
-                           (directory-files-recursively
-                            full-file regexp include-directories
-                            predicate follow-symlinks))))
-                    (setq result (nconc result sub-files))))
-                (when (and include-directories
-                           (string-match regexp leaf))
-                  (setq result (nconc result (list full-file)))))
-            (when (string-match regexp file)
-              (push (concat dir "/" file) files)))))
-      (nconc result (nreverse files)))))
+  "..."
+  (let* ((result nil)
+         (files nil)
+         (dir (directory-file-name dir))
+         ;; When DIR is "/", remote file names like "/method:" could
+         ;; also be offered.  We shall suppress them.
+         (tramp-mode (and tramp-mode (file-remote-p (expand-file-name dir)))))
+    (dolist (file (sort (file-name-all-completions "" dir)
+                        'string<))
+      (unless (member file '("./" "../"))
+        (if (directory-name-p file)
+            (let* ((leaf (substring file 0 (1- (length file))))
+                   (full-file (concat dir "/" leaf)))
+              ;; Don't follow symlinks to other directories.
+              (when (and (or (not (file-symlink-p full-file))
+                             (and (file-symlink-p full-file)
+                                  follow-symlinks))
+                         ;; Allow filtering subdirectories.
+                         (or (eq predicate nil)
+                             (eq predicate t)
+                             (funcall predicate full-file)))
+                (let ((sub-files
+                       (if (eq predicate t)
+                           (ignore-error file-error
+                             (eask-directory-files-recursively
+                              full-file regexp include-directories
+                              predicate follow-symlinks))
+                         (eask-directory-files-recursively
+                          full-file regexp include-directories
+                          predicate follow-symlinks))))
+                  (setq result (nconc result sub-files))))
+              (when (and include-directories
+                         (string-match regexp leaf))
+                (setq result (nconc result (list full-file)))))
+          (when (string-match regexp file)
+            (push (concat dir "/" file) files)))))
+    (nconc result (nreverse files))))
 
-(eask-defvc< 28
-  (defun always (&rest _arguments)
-    "Ignore ARGUMENTS, do nothing, and return t.
-This function accepts any number of arguments in ARGUMENTS.
-Also see `ignore'."
-    t))
+;; XXX: Support after Emacs 28.1
+(defun eask-always (&rest _arguments)
+  "..."
+  t)
 
 ;;; extern/compat.el ends here

lisp/format/elfmt.el

@@ -27,7 +27,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core

lisp/format/elisp-autofmt.el

@@ -29,7 +29,7 @@
 
 (eask-command-check "29.1")
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core

lisp/lint/checkdoc.el

@@ -30,7 +30,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core

lisp/lint/declare.el

@@ -27,7 +27,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core

lisp/lint/elint.el

@@ -27,7 +27,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core

lisp/lint/elisp-lint.el

@@ -27,7 +27,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core

lisp/lint/elsa.el

@@ -33,7 +33,7 @@
 ;;
 ;;; Flags
 
-(advice-add #'eask-allow-error-p :override #'always)
+(advice-add #'eask-allow-error-p :override #'eask-always)
 
 ;;
 ;;; Core