[elpa] 77/287: Ensure ergoemacs-global-override-rm-keys is a list of vectors

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit d3f3e32f73c796e8580cad2642fd202f8dacc599
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jun 12 10:17:14 2014 -0500

    Ensure ergoemacs-global-override-rm-keys is a list of vectors
---
 ergoemacs-advices.el |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index 5c780ae..798382f 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -103,19 +103,19 @@ Also adds keymap-flag for user-defined keys run with 
`run-mode-hooks'."
         (add-to-list 'ergoemacs-global-changed-cache (key-description key))
         (when ergoemacs-global-not-changed-cache
           (delete (key-description key) ergoemacs-global-not-changed-cache))
-        (add-to-list 'ergoemacs-global-override-rm-keys key)
-        (when (and (boundp 'ergoemacs-mode) ergoemacs-mode)
-          (setq ergoemacs-shortcut-keymap (ergoemacs-rm-key 
ergoemacs-shortcut-keymap key)
-                ergoemacs-read-input-keymap (ergoemacs-rm-key 
ergoemacs-read-input-keymap key)
-                ergoemacs-keymap (ergoemacs-rm-key ergoemacs-keymap key)
-                ergoemacs-unbind-keymap (ergoemacs-rm-key ergoemacs-keymap 
key))
-          (remhash key ergoemacs-command-shortcuts-hash)
-          (setq ergoemacs-read-emulation-mode-map-alist
-                (list (cons 'ergoemacs-read-input-keys 
ergoemacs-read-input-keymap))
-                ergoemacs-emulation-mode-map-alist
-                (append (nbutlast ergoemacs-emulation-mode-map-alist 1)
-                        (list (cons 'ergoemacs-shortcut-keys 
ergoemacs-shortcut-keymap))))
-          (ergoemacs-shuffle-keys t))))))
+        (add-to-list 'ergoemacs-global-override-rm-keys (or (and (vectorp key) 
key)
+                                                            (read-kbd-macro 
(key-description key) t)))
+        (setq ergoemacs-shortcut-keymap (ergoemacs-rm-key 
ergoemacs-shortcut-keymap key)
+              ergoemacs-read-input-keymap (ergoemacs-rm-key 
ergoemacs-read-input-keymap key)
+              ergoemacs-keymap (ergoemacs-rm-key ergoemacs-keymap key)
+              ergoemacs-unbind-keymap (ergoemacs-rm-key ergoemacs-keymap key))
+        (remhash key ergoemacs-command-shortcuts-hash)
+        (setq ergoemacs-read-emulation-mode-map-alist
+              (list (cons 'ergoemacs-read-input-keys 
ergoemacs-read-input-keymap))
+              ergoemacs-emulation-mode-map-alist
+              (append (nbutlast ergoemacs-emulation-mode-map-alist 1)
+                      (list (cons 'ergoemacs-shortcut-keys 
ergoemacs-shortcut-keymap))))
+        (ergoemacs-shuffle-keys t)))))
 
 (defadvice local-set-key (around ergoemacs-local-set-key-advice (key command) 
activate)
   "This let you use `local-set-key' as usual when `ergoemacs-mode' is enabled."