From 6d89a5549da2223188376309239cb38b5707fdac Mon Sep 17 00:00:00 2001 From: Jen-Chieh Date: Fri, 9 Dec 2022 14:38:48 +0800 Subject: [PATCH 1/2] feat: Pick Eask-file by version --- lisp/_prepare.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 7e829da6..db87d711 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -591,7 +591,11 @@ Eask file in the workspace." (defun eask-file-try-load (relative-path) "Try load eask file in RELATIVE-PATH." - (or (eask-file-load (concat relative-path "Easkfile") t) + (or (eask-file-load (concat relative-path (format "Easkfile.%s" emacs-version)) t) + (eask-file-load (concat relative-path (format "Eask.%s" emacs-version)) t) + (eask-file-load (concat relative-path (format "Easkfile.%s" emacs-major-version)) t) + (eask-file-load (concat relative-path (format "Eask.%s" emacs-major-version)) t) + (eask-file-load (concat relative-path "Easkfile") t) (eask-file-load (concat relative-path "Eask") t))) (defun eask--print-env-info () From fa9fe950502b6a5ff252c2f74a282eb64aa32e9a Mon Sep 17 00:00:00 2001 From: Jen-Chieh Date: Fri, 9 Dec 2022 14:42:51 +0800 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae4f8f6e..0b17df80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how * Generate log files in user directory (974a17e3b573520a775f813c72ecbd30a32012bf) * Make sure there is no eval error in the root layer (fbd8eb4b91dfbb614b2b59a1a2a7fea9f594313d) * Recognize `bsdtar` for windows (#64) +* Pick Eask-file by Emacs version, allow multiple Eask-files (#68) ## 0.7.x > Released Sep 08, 2022