Skip to content

Commit 2b41f5d

Browse files
committed
feat: Clean up compat
1 parent faca05c commit 2b41f5d

File tree

5 files changed

+29
-70
lines changed

5 files changed

+29
-70
lines changed

cmds/create/elpa.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ exports.handler = async (argv) => {
5252
console.warn('✗ Error while cloning template project');
5353
console.warn('');
5454
console.warn(' [1] Make sure you have git installed and has the right permission');
55-
process.stderr.write(` [2] Failed because of the target directory isn't empty`);
55+
console.warn(` [2] Failed because of the target directory isn't empty`);
56+
console.warn('');
57+
process.stderr.write(`Visit https://emacs-eask.github.io/ for quickstart guide and full documentation.`);
5658
});
5759
}
5860

lisp/_prepare.el

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,13 @@ the `eask-start' execution.")
240240
(delete-region (point-min) (point))
241241
(eval-buffer)))
242242

243+
;;
244+
;;; Compat
245+
246+
(defun eask-always (&rest _arguments)
247+
"The function `always' is supported after Emacs 28.1."
248+
t)
249+
243250
;;
244251
;;; Util
245252

@@ -2230,7 +2237,6 @@ variable we use to test validation."
22302237
;;
22312238
;;; Externals
22322239

2233-
(eask-load "extern/compat")
22342240
(eask-load "extern/ansi")
22352241
(eask-load "extern/package")
22362242
(eask-load "extern/package-build")

lisp/create/elpa.el

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
(locate-dominating-file dir "_prepare.el"))
2020
nil t))
2121

22+
;;
23+
;;; Core
24+
2225
(defconst eask-create-elpa--template-name "template-elpa"
2326
"Holds template project name.")
2427

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

lisp/extern/compat.el

Lines changed: 0 additions & 52 deletions
This file was deleted.

test/development/compat.el

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
;;; Test functions
1818

1919
(defconst compat-functions
20-
'(ansi-color-filter-apply
21-
thing-at-point--read-from-whole-string
22-
ls-lisp-format-file-size
23-
lsh
24-
package--alist
25-
package--activate-all
26-
package-activate-all
27-
package-generate-description-file
28-
locate-dominating-file
29-
url-file-exists-p
30-
prin1-to-string)
20+
'( ansi-color-filter-apply
21+
thing-at-point--read-from-whole-string
22+
ls-lisp-format-file-size
23+
lsh
24+
package--alist
25+
package--activate-all
26+
package-activate-all
27+
package-generate-description-file
28+
locate-dominating-file
29+
url-file-exists-p
30+
prin1-to-string)
3131
"List of function to check Emacs compatibility.")
3232

3333
(message "Starting compatibility test for functions...")
@@ -45,10 +45,10 @@
4545
;;; Test variables
4646

4747
(defconst compat-variables
48-
'(finder-known-keywords
49-
package-quickstart-file
50-
print-level
51-
print-length)
48+
'( finder-known-keywords
49+
package-quickstart-file
50+
print-level
51+
print-length)
5252
"List of variables to check Emacs compatibility.")
5353

5454
(message "Starting compatibility test for variables...")

0 commit comments

Comments
 (0)