[elpa] 205/287: Only push new keys to ergoemacs-global-override-rm-keys, and don't push [remap]s (Issue #243)

[Matthew Fidler]

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

commit 6be87798a6c326d6ff02dd09d441318ea22825e6
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jun 23 23:14:51 2014 +0800

    Only push new keys to ergoemacs-global-override-rm-keys, and don't
    push [remap]s (Issue #243)
---
 ergoemacs-theme-engine.el |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 3787c13..26c37e7 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1832,6 +1832,7 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
             ;; Reset keymaps.
             (dolist (map '(ergoemacs-shortcut-keymap 
ergoemacs-read-input-keymap ergoemacs-keymap ergoemacs-unbind-keymap))
               (when (symbol-value map)
+                (message "Rm Key %s" (key-description key))
                 (set map (ergoemacs-rm-key (symbol-value map) key))
                 (setq lk (lookup-key (symbol-value map) key))
                 (if (not (integerp lk))
@@ -1859,8 +1860,10 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
             ;;Put maps in `minor-mode-map-alist'
             (ergoemacs-shuffle-keys t))
           (when (and (or (commandp lk t)
-                         (keymapp lk)))
-            (push key ergoemacs-global-override-rm-keys)
+                         (keymapp lk))
+                     (not (member key '([remap] ))))
+            (pushnew key ergoemacs-global-override-rm-keys
+                     :test 'equal)
             (throw 'found-global-command t)))
         (setq key (substring key 0 (- (length key) 1)))))))