[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 69/287: Install shortcut-layer appropriately for keymaps.
From: |
Matthew Fidler |
Subject: |
[elpa] 69/287: Install shortcut-layer appropriately for keymaps. |
Date: |
Wed, 02 Jul 2014 14:44:42 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 8fa92e9f13e5d56e4a080adf111008a45e0e927d
Author: Matthew L. Fidler <address@hidden>
Date: Wed Jun 11 11:32:02 2014 -0500
Install shortcut-layer appropriately for keymaps.
---
ergoemacs-theme-engine.el | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 0132158..2fd1a39 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1095,7 +1095,6 @@ FULL-SHORTCUT-MAP-P "
(menu-keymap (make-sparse-keymap))
final-map final-shortcut-map final-read-map
(i 0))
-
;; Get all the major-mode hooks that will be called or modified
(setq ergoemacs-deferred-maps '()
ergoemacs-deferred-keys '())
@@ -1117,11 +1116,11 @@ FULL-SHORTCUT-MAP-P "
`(lambda() ,(format "Turn on `ergoemacs-mode' for `%s'
during the hook `%s'."
(symbol-name map-name) (symbol-name
hook))
(let ((new-map ',map))
+ (ergoemacs-theme--install-shortcuts-list
+ ',shortcut-list new-map ,map-name ,full-map)
(set ',map-name
(copy-keymap
- (make-composed-keymap
- (ergoemacs-theme--install-shortcuts-list
- ',shortcut-list new-map ,map-name
,full-map) ,map-name))))))
+ (make-composed-keymap new-map
,map-name))))))
(funcall (if remove-p #'remove-hook #'add-hook) hook
fn-name)))
((and modify-map (not (boundp map-name)))
@@ -1140,10 +1139,11 @@ FULL-SHORTCUT-MAP-P "
(setq o-map (copy-keymap (symbol-value map-name)))
(puthash map-name o-map ergoemacs-original-map-hash))
(setq n-map (copy-keymap map))
+ (ergoemacs-theme--install-shortcuts-list
+ shortcut-list n-map o-map full-map)
(set map-name (copy-keymap
(make-composed-keymap
- (ergoemacs-theme--install-shortcuts-list
- shortcut-list n-map o-map full-map)
+ n-map
o-map)))))
(t ;; Maps that are not modified.
(unless remove-p
- [elpa] 64/287: Replace either M-x or <execute> with M-x code., (continued)
- [elpa] 64/287: Replace either M-x or <execute> with M-x code., Matthew Fidler, 2014/07/02
- [elpa] 63/287: Fixed mapvar issues., Matthew Fidler, 2014/07/02
- [elpa] 47/287: Stage some components, Matthew Fidler, 2014/07/02
- [elpa] 62/287: Playing with object more., Matthew Fidler, 2014/07/02
- [elpa] 53/287: Better debug and modify keymaps fix bugs, Matthew Fidler, 2014/07/02
- [elpa] 59/287: Fix typo, Matthew Fidler, 2014/07/02
- [elpa] 61/287: Ergoemacs-mode setup with object almost complete., Matthew Fidler, 2014/07/02
- [elpa] 66/287: Make ergoemacs-clean toggle debug on error, Matthew Fidler, 2014/07/02
- [elpa] 71/287: Fix isearch issues., Matthew Fidler, 2014/07/02
- [elpa] 60/287: Ensure the object-name is a string. EIEIO seems to prefer this., Matthew Fidler, 2014/07/02
- [elpa] 69/287: Install shortcut-layer appropriately for keymaps.,
Matthew Fidler <=
- [elpa] 73/287: use remove-duplicates instead, Matthew Fidler, 2014/07/02
- [elpa] 70/287: Fix most global-set-key after issues, Matthew Fidler, 2014/07/02
- [elpa] 65/287: Add more emulation alists. Less list manipulation, Matthew Fidler, 2014/07/02
- [elpa] 74/287: Fix <apps> e t bug with object interface., Matthew Fidler, 2014/07/02
- [elpa] 75/287: Only put in shortcut-hash if not removed from keymap., Matthew Fidler, 2014/07/02
- [elpa] 68/287: Make the caching more robust, Matthew Fidler, 2014/07/02
- [elpa] 72/287: Fix copy objects to allow keymap versions., Matthew Fidler, 2014/07/02
- [elpa] 79/287: Fix final map to be a composed keymap that works with ergoemacs-rm-key, Matthew Fidler, 2014/07/02
- [elpa] 76/287: Only Issue 86 still persists., Matthew Fidler, 2014/07/02
- [elpa] 77/287: Ensure ergoemacs-global-override-rm-keys is a list of vectors, Matthew Fidler, 2014/07/02