[elpa] externals/ergoemacs-mode 65d9779b91 2/7: More emacs 24 backward changes

[ELPA Syncer]

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

    More emacs 24 backward changes
---
 ergoemacs-advice.el | 2 +-
 ergoemacs-mode.el   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-advice.el b/ergoemacs-advice.el
index de7756f9f8..08e54e7fb0 100644
--- a/ergoemacs-advice.el
+++ b/ergoemacs-advice.el
@@ -55,7 +55,7 @@
 (declare-function ergoemacs-key-description "ergoemacs-key-description")
 
 (defun ergoemacs-advice-substitute-command-keys (orig-fun &rest args)
-  "Use `ergoemacs-substitute-command-keys' when `ergoemacs-mode' is enabled"
+  "Use `ergoemacs-substitute-command-keys' when `ergoemacs-mode' is enabled."
   (if ergoemacs-mode
       (ergoemacs-key-description--substitute-command-keys (nth 0 args))
     (funcall orig-fun args)))
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 24b0704979..da187dfd48 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -471,8 +471,10 @@ 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)
-  (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."