[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 205/287: Only push new keys to ergoemacs-global-override-rm-keys,
From: |
Matthew Fidler |
Subject: |
[elpa] 205/287: Only push new keys to ergoemacs-global-override-rm-keys, and don't push [remap]s (Issue #243) |
Date: |
Wed, 02 Jul 2014 14:46:01 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 6be87798a6c326d6ff02dd09d441318ea22825e6
Author: Matthew L. Fidler <address@hidden>
Date: Mon Jun 23 23:14:51 2014 +0800
Only push new keys to ergoemacs-global-override-rm-keys, and don't
push [remap]s (Issue #243)
---
ergoemacs-theme-engine.el | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 3787c13..26c37e7 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1832,6 +1832,7 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
;; Reset keymaps.
(dolist (map '(ergoemacs-shortcut-keymap
ergoemacs-read-input-keymap ergoemacs-keymap ergoemacs-unbind-keymap))
(when (symbol-value map)
+ (message "Rm Key %s" (key-description key))
(set map (ergoemacs-rm-key (symbol-value map) key))
(setq lk (lookup-key (symbol-value map) key))
(if (not (integerp lk))
@@ -1859,8 +1860,10 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
;;Put maps in `minor-mode-map-alist'
(ergoemacs-shuffle-keys t))
(when (and (or (commandp lk t)
- (keymapp lk)))
- (push key ergoemacs-global-override-rm-keys)
+ (keymapp lk))
+ (not (member key '([remap] ))))
+ (pushnew key ergoemacs-global-override-rm-keys
+ :test 'equal)
(throw 'found-global-command t)))
(setq key (substring key 0 (- (length key) 1)))))))
- [elpa] 180/287: Remap universal-argument to ergoemacs-universal-argument, (continued)
- [elpa] 180/287: Remap universal-argument to ergoemacs-universal-argument, Matthew Fidler, 2014/07/02
- [elpa] 182/287: Add package-requires for emacs 24.1, Matthew Fidler, 2014/07/02
- [elpa] 183/287: Split out ert, Matthew Fidler, 2014/07/02
- [elpa] 185/287: Bug fix for ergoemacs-substitute-command., Matthew Fidler, 2014/07/02
- [elpa] 184/287: Now use ergoemacs-pretty-key to describe fn keys, Matthew Fidler, 2014/07/02
- [elpa] 186/287: Fix ergoemacs-read-key-lookup-get-ret---universal, Matthew Fidler, 2014/07/02
- [elpa] 189/287: Do all tests, Matthew Fidler, 2014/07/02
- [elpa] 188/287: Fix some byte-compile issues, Matthew Fidler, 2014/07/02
- [elpa] 190/287: Fix Issue #233, Matthew Fidler, 2014/07/02
- [elpa] 193/287: Fix Issue #241, Matthew Fidler, 2014/07/02
- [elpa] 205/287: Only push new keys to ergoemacs-global-override-rm-keys, and don't push [remap]s (Issue #243),
Matthew Fidler <=
- [elpa] 191/287: change downcase and UPCASE for being more clear., Matthew Fidler, 2014/07/02
- [elpa] 208/287: Fix helm-M-x keys again., Matthew Fidler, 2014/07/02
- [elpa] 206/287: Remove debugging comment for ergoemacs-rm-key, Matthew Fidler, 2014/07/02
- [elpa] 207/287: Fix ergoemacs-pushnew Issue #244., Matthew Fidler, 2014/07/02
- [elpa] 209/287: Declare ergoemacs-use-M-x-p, Matthew Fidler, 2014/07/02
- [elpa] 210/287: Test Issue #243. C-c C-c M-x vs C-c C-c., Matthew Fidler, 2014/07/02
- [elpa] 211/287: Add send outlook files to emacs, Matthew Fidler, 2014/07/02
- [elpa] 213/287: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/02
- [elpa] 215/287: Merge pull request #245 from bmalehorn/programmer-dv, Matthew Fidler, 2014/07/02
- [elpa] 214/287: fix incorrect ergoemacs-layout-programmer-dv, Matthew Fidler, 2014/07/02