[elpa] externals/ergoemacs-mode 6cc8b68270 4/7: Revert "Don't use advice in old emacs versions"

[ELPA Syncer]

branch: externals/ergoemacs-mode
commit 6cc8b68270887c50589ed80a2885382ff2315e06
Author: Matthew Fidler <matthew.fidler@gmail.com>
Commit: Matthew Fidler <matthew.fidler@gmail.com>

    Revert "Don't use advice in old emacs versions"
    
    This reverts commit 1cc9589747334882c3d66edbe8100b156a65bee5.
---
 ergoemacs-mode.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 1d9c13a68d..da187dfd48 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -471,16 +471,16 @@ 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> emacs-version "25.3")
-    (advice-add 'undefined :around #'ergoemacs-advice-undefined)
-    (advice-add 'read-key :around #'ergoemacs-read-key)))
+  (unwind-protect
+      (progn
+        (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> emacs-version "25.3")
-    (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