[elpa] 76/287: Only Issue 86 still persists.

[Matthew Fidler]

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

commit acb6a6678454fd494022ea858999b925e64e01bc
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jun 12 09:54:45 2014 -0500

    Only Issue 86 still persists.
---
 ergoemacs-advices.el      |    1 +
 ergoemacs-shortcuts.el    |    6 ++++--
 ergoemacs-theme-engine.el |    1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index acd50b9..5c780ae 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -109,6 +109,7 @@ Also adds keymap-flag for user-defined keys run with 
`run-mode-hooks'."
                 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
diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 431696f..930d109 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -960,8 +960,10 @@ FORCE-KEY forces keys like <escape> to work properly.
                     (if (nth 0 hash)
                         (progn
                           (setq fn (nth 0 hash))
-                          ;; Send Shortcut key directly
-                          (when (ignore-errors (stringp (nth 0 fn)))
+                          ;;  Send Shortcut key directly
+                          (when (ignore-errors (and (stringp (nth 0 fn))
+                                                    (or (not (nth 1 fn))
+                                                        (eq (nth 1 fn) 
'normal))))
                             (setq key (read-kbd-macro (nth 0 fn) t))))
                       (setq fn (key-binding key))
                       (setq fn (or (command-remapping fn (point)) fn)))
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 80c8d56..87d9a8b 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1122,7 +1122,6 @@ FULL-SHORTCUT-MAP-P "
 
 
 (defmethod ergoemacs-theme-obj-install ((obj 
ergoemacs-theme-component-map-list) &optional remove-p)
-  ;; First call 8 sec; Second call 2 sec.. Need to speed up?
   (with-slots (read-map
                map
                shortcut-map