mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 36e185495f05a31f34c4f148aa176a06727511ed Author: Matthew L. Fidler <[email protected]> Date: Thu Jun 12 10:43:31 2014 -0500 Fix final map to be a composed keymap that works with ergoemacs-rm-key --- ergoemacs-theme-engine.el | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index d92b4b7..e497239 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -1247,9 +1247,13 @@ The actual keymap changes are included in `ergoemacs-emulation-mode-map-alist'." ;; Coaleasing the keymaps needs to be done after removing the ;; keys, otherwise the keys are not removed... Probably ;; playing with pointers in C. - ;; (setq final-map (ergoemacs-get-fixed-map--combine-maps menu-keymap final-map)) + ;;(setq final-map (ergoemacs-get-fixed-map--combine-maps menu-keymap final-map)) ;; Use a combined keymap instead - (setq final-map (make-composed-keymap (list menu-keymap final-map))) + (if (not (ignore-errors (nth 0 (nth 1 final-map)))) + (setq final-map (list final-map)) + (pop final-map)) + (push menu-keymap final-map) + (setq final-map (make-composed-keymap final-map)) ;; Rebuild Shortcut hash (let (tmp) (dolist (c (reverse shortcut-list))
