emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/evil 16506d9343: Fix define-globalized-minor-mode BODY in


From: ELPA Syncer
Subject: [nongnu] elpa/evil 16506d9343: Fix define-globalized-minor-mode BODY in Emacs <27
Date: Wed, 13 Dec 2023 18:59:13 -0500 (EST)

branch: elpa/evil
commit 16506d934342fd905ce4c88684f04ddb123c02a4
Author: Axel Forsman <axel@axelf.se>
Commit: Tom Dalziel <tom_dl@hotmail.com>

    Fix define-globalized-minor-mode BODY in Emacs <27
    
    This commit reintroduces the evil-mode advice that commit
    f003ca28a9691d24a17866e5dce3e7866c9bb257 replaced with a BODY argument
    to define-globalized-minor-mode, as that broke support for older
    versions of Emacs since the BODY parameter was only recently
    introduced in Emacs 27.
---
 evil-core.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/evil-core.el b/evil-core.el
index 23937e7d30..4190997767 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -169,9 +169,10 @@ To enable Evil globally, do (evil-mode)."
 (defalias 'evil--fundamental-mode #'fundamental-mode)
 
 ;;;###autoload (autoload 'evil-mode "evil" nil t)
-(define-globalized-minor-mode evil-mode
-  evil-local-mode evil-initialize
-  :group 'evil
+(define-globalized-minor-mode evil-mode evil-local-mode evil-initialize
+  :group 'evil)
+
+(defadvice evil-mode (after start-evil activate)
   ;; Hooks used to not run in Fundamental buffers (bug#23827), so
   ;; other measures are necessary to initialize Evil there. When Evil
   ;; is enabled globally, the default value of `major-mode' is set to
@@ -183,12 +184,12 @@ To enable Evil globally, do (evil-mode)."
              (setq-default major-mode 'evil--fundamental-mode))
         (ad-enable-regexp "^evil")
         (ad-activate-regexp "^evil")
-        (evil-esc-mode 1))
+        (with-no-warnings (evil-esc-mode 1)))
     (when (eq (default-value 'major-mode) 'evil--fundamental-mode)
       (setq-default major-mode 'fundamental-mode))
     (ad-disable-regexp "^evil")
     (ad-update-regexp "^evil")
-    (evil-esc-mode -1)))
+    (with-no-warnings (evil-esc-mode -1))))
 
 (defun evil-change-state (state &optional message)
   "Change the state to STATE.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]