From b410a7fa28d73471c90d8a0856c5ed77a1102727 Mon Sep 17 00:00:00 2001 From: Matthew Fidler Date: Tue, 7 Feb 2023 09:50:05 -0600 Subject: Fix ergoemacs-mode to use correct version of nadvice --- ergoemacs-mode.el | 12 +++++------- 1 file 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 -- cgit v1.0