mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 792bf2546c8bfd9b0cf161a11f6cb6d7d6d453a2 Author: Matthew L. Fidler <[email protected]> Date: Fri Jun 13 07:37:06 2014 -0500 Ignored keys shouldn't be in the shortcut hash --- ergoemacs-theme-engine.el | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index 48124f1..6e4d154 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -1895,7 +1895,9 @@ DONT-COLLAPSE doesn't collapse empty keymaps" (when (and (ergoemacs-global-changed-p key) (or (commandp lk t) (keymapp lk))) - (add-to-list 'ergoemacs-global-override-rm-keys key) + ;; Remove from shortcuts, if present + (remhash key ergoemacs-command-shortcuts-hash) + (push key ergoemacs-global-override-rm-keys) (throw 'found-global-command t)) (setq key (substring key 0 (- (length key) 1)))))))
