[elpa] externals/ergoemacs-mode 868382a650 2/2: Revert "Don't use advice by default"

[ELPA Syncer]

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

    Revert "Don't use advice by default"
    
    This reverts commit 8b3c3eee91d4a1ebe4e2795f5b0c0e13a67395a4.
---
 ergoemacs-mode.el | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 3b8223f76a..24b0704979 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -459,9 +459,6 @@ after initializing ergoemacs-mode.
 
 (defvar ergoemacs-mode-term-raw-keymap (make-sparse-keymap)
   "This is the `ergoemacs-mode' terminal raw keymap.  Only Meta/alt keys are 
applied.")
-
-(defvar ergoemacs-use-advice nil
-  )
 (defun ergoemacs-setup-override-keymap ()
   "Setup `ergoemacs-mode' keymaps."
   (setq ergoemacs-override-alist
@@ -474,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 ergoemacs-use-advice
-    (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 ergoemacs-use-advice
-    (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