summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Fidler <matthew.fidler@gmail.com>2023-02-07 09:50:05 -0600
committerMatthew Fidler <matthew.fidler@gmail.com>2023-02-07 09:50:05 -0600
commitb410a7fa28d73471c90d8a0856c5ed77a1102727 (patch)
tree5c9c7e8d1dd890516060128cf4f8c2608b28cf87
parent8debd046b5a79525bb6f1a0185eeb2a2c7f065ac (diff)
Fix ergoemacs-mode to use correct version of nadvice
-rw-r--r--ergoemacs-mode.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 383568e..fa94c9d 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -10,7 +10,7 @@
;; Created: August 01 2007
;; Keywords: convenience
;; Version: 5.16.10.12
-;; Package-Requires: ((emacs "24.1") (cl-lib "0.5") (nadvice "0.1"))
+;; Package-Requires: ((emacs "24.1") (cl-lib "0.5") (nadvice "0.4"))
;; URL: https://github.com/ergoemacs/ergoemacs-mode
;; ErgoEmacs is free software: you can redistribute it and/or modify
@@ -471,16 +471,14 @@ after initializing ergoemacs-mode.
(ergoemacs-mode-regular . ,ergoemacs-keymap)
(ergoemacs-mode-send-emacs-keys . ,ergoemacs--send-emacs-keys-map)))
(add-hook 'emulation-mode-map-alists ergoemacs-override-alist)
- (when (version<= "24.4" emacs-version)
- (advice-add 'undefined :around #'ergoemacs-advice-undefined)
- (advice-add 'read-key :around #'ergoemacs-read-key)))
+ (advice-add 'undefined :around #'ergoemacs-advice-undefined)
+ (advice-add 'read-key :around #'ergoemacs-read-key))
(defun ergoemacs-remove-override-keymap ()
"Remove `ergoemacs-mode' keymaps."
(remove-hook 'emulation-mode-map-alists 'ergoemacs-override-alist)
- (when (version<= "24.4" emacs-version)
- (advice-remove 'undefined #'ergoemacs-advice-undefined)
- (advice-remove 'read-key #'ergoemacs-read-key)))
+ (advice-remove 'undefined #'ergoemacs-advice-undefined)
+ (advice-remove 'read-key #'ergoemacs-read-key))
;;; Frequently used commands as aliases