[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 84/117: Flatten keymaps
From: |
Matthew Fidler |
Subject: |
[elpa] 84/117: Flatten keymaps |
Date: |
Fri, 25 Jul 2014 13:24:27 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 1fa932399d25be9d0971af7843f08f2532972ab7
Author: Matthew L. Fidler <address@hidden>
Date: Tue Jul 22 08:15:12 2014 -0500
Flatten keymaps
---
ergoemacs-theme-engine.el | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index a7efba1..a4355e3 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1540,8 +1540,8 @@ FULL-SHORTCUT-MAP-P "
;; (setq n-map (list (make-sparse-keymap
"ergoemacs-modified") n-map))
))
(push map n-map)
- (setq n-map (copy-keymap (make-composed-keymap n-map o-map)
;; (ergoemacs-flatten-composed-keymap (make-composed-keymap n-map o-map))
- ))
+ (setq n-map (copy-keymap ;; (make-composed-keymap n-map
o-map)
+ (ergoemacs-flatten-composed-keymap
(make-composed-keymap n-map o-map))))
(set map-name n-map)))
(t ;; Maps that are not modified.
(unless remove-p
@@ -1573,8 +1573,8 @@ The actual keymap changes are included in
`ergoemacs-emulation-mode-map-alist'."
(unless (eq defer '())
(push (cons i defer) ergoemacs-deferred-keys))
(setq i (+ i 1))
- (push (cons emulation-var (ergoemacs-get-fixed-map--composite
tmp);; (ergoemacs-flatten-composed-keymap (ergoemacs-get-fixed-map--composite
tmp))
- )
+ (push (cons emulation-var ;; (ergoemacs-get-fixed-map--composite
tmp)
+ (ergoemacs-flatten-composed-keymap
(ergoemacs-get-fixed-map--composite tmp)))
hook-map-list))))
;; Reset shortcut hash
@@ -1619,8 +1619,7 @@ The actual keymap changes are included in
`ergoemacs-emulation-mode-map-alist'."
(setq final-map (list final-map)))
(push menu-keymap final-map)
(setq final-map (make-composed-keymap final-map))
- ;; Currently broken takes out menu :( at the very least
- ;;(setq final-map (ergoemacs-flatten-composed-keymap final-map))
+ (setq final-map (ergoemacs-flatten-composed-keymap final-map))
;; Rebuild Shortcut hash
(let (tmp)
(dolist (c (reverse shortcut-list))
@@ -1650,12 +1649,12 @@ The actual keymap changes are included in
`ergoemacs-emulation-mode-map-alist'."
ergoemacs-no-shortcut-keys nil
ergoemacs-read-input-keys (not remove-p)
ergoemacs-unbind-keys (not remove-p)
- ergoemacs-read-input-keymap final-read-map
;;(ergoemacs-flatten-composed-keymap final-read-map)
+ ergoemacs-read-input-keymap (ergoemacs-flatten-composed-keymap
final-read-map)
ergoemacs-read-emulation-mode-map-alist
`((ergoemacs-read-input-keys ,@final-read-map))
ergoemacs-read-emulation-mode-map-alist nil
- ergoemacs-shortcut-keymap final-shortcut-map
;;(ergoemacs-flatten-composed-keymap final-shortcut-map)
- ergoemacs-no-shortcut-keymap final-no-shortcut-map ;;
(ergoemacs-flatten-composed-keymap final-no-shortcut-map)
- ergoemacs-unbind-keymap final-unbind-map ;;
(ergoemacs-flatten-composed-keymap final-unbind-map)
+ ergoemacs-shortcut-keymap (ergoemacs-flatten-composed-keymap
final-shortcut-map)
+ ergoemacs-no-shortcut-keymap (ergoemacs-flatten-composed-keymap
final-no-shortcut-map)
+ ergoemacs-unbind-keymap (ergoemacs-flatten-composed-keymap
final-unbind-map)
ergoemacs-emulation-mode-map-alist
(reverse
(append
@@ -1667,8 +1666,7 @@ The actual keymap changes are included in
`ergoemacs-emulation-mode-map-alist'."
(when deferred-keys
(push (cons i (cons remap deferred-keys))
ergoemacs-deferred-keys))
(setq i (+ i 1))
- (cons remap map ;; (ergoemacs-flatten-composed-keymap map)
- )))
+ (cons remap (ergoemacs-flatten-composed-keymap map))))
(ergoemacs-get-hooks obj "-mode\\'"))))
ergoemacs-shortcut-emulation-mode-map-alist
`((ergoemacs-shortcut-keys ,@final-shortcut-map))
- [elpa] 82/117: Remove ergoemacs-mode from custom set vars, (continued)
- [elpa] 82/117: Remove ergoemacs-mode from custom set vars, Matthew Fidler, 2014/07/25
- [elpa] 86/117: Clear local ergoemacs-mode read-key captures, Matthew Fidler, 2014/07/25
- [elpa] 85/117: Fix cut and copy issues, Matthew Fidler, 2014/07/25
- [elpa] 83/117: Handle menu-bar when flattening keymaps., Matthew Fidler, 2014/07/25
- [elpa] 88/117: Add non-defined functions to map, Matthew Fidler, 2014/07/25
- [elpa] 89/117: Fix byte compile warning, Matthew Fidler, 2014/07/25
- [elpa] 91/117: Fix remaps to not use shortcuts, Matthew Fidler, 2014/07/25
- [elpa] 92/117: Remove local read-key reset; Shouldn't be needed, Matthew Fidler, 2014/07/25
- [elpa] 90/117: Hack to make search-reg work. Should work normally :(, Matthew Fidler, 2014/07/25
- [elpa] 95/117: No need to create autoloads any longer, Matthew Fidler, 2014/07/25
- [elpa] 84/117: Flatten keymaps,
Matthew Fidler <=
- [elpa] 93/117: Fix dired-mode-map changes by requiring dired, Matthew Fidler, 2014/07/25
- [elpa] 96/117: Add back dired-jump, Matthew Fidler, 2014/07/25
- [elpa] 87/117: Handle the (keymap (keymap ...)) composed keymap, Matthew Fidler, 2014/07/25
- [elpa] 97/117: Move wdired-exit to ergoemacs-keyboard-quit, Matthew Fidler, 2014/07/25
- [elpa] 94/117: Apply deferred keys., Matthew Fidler, 2014/07/25
- [elpa] 99/117: Don't save so much. Just save once., Matthew Fidler, 2014/07/25
- [elpa] 100/117: Do not reset ergoemacs-command-shortcuts-hash, Matthew Fidler, 2014/07/25
- [elpa] 101/117: Add DEL as known key binding, Matthew Fidler, 2014/07/25
- [elpa] 102/117: Tell user that the global keys are overriding ergoemacs-keys, Matthew Fidler, 2014/07/25
- [elpa] 103/117: Only complain when initially changing the key, Matthew Fidler, 2014/07/25