[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode f5aa0f7 63/87: Merge pull request #496 f
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode f5aa0f7 63/87: Merge pull request #496 from wlandry/command_loop |
Date: |
Wed, 14 Apr 2021 18:47:09 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit f5aa0f7b9150b2387769b15362d05178189e2630
Merge: 67e8c66 131b3fb
Author: Matthew Fidler <matthew.fidler@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #496 from wlandry/command_loop
Fix command-loop errors
---
ergoemacs-mapkeymap.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ergoemacs-mapkeymap.el b/ergoemacs-mapkeymap.el
index cb08017..199329e 100644
--- a/ergoemacs-mapkeymap.el
+++ b/ergoemacs-mapkeymap.el
@@ -194,7 +194,9 @@ them to be masked when mapping over the keymap."
(cond
((consp event)
(ergoemacs-map-set-char-table-range
- (or (and prefix (lookup-key flat-keymap prefix))
+ (or (and prefix
+ (let ((prefix-lookup (lookup-key flat-keymap prefix)))
+ (if (listp prefix-lookup) prefix-lookup)))
flat-keymap) event item))
(t
(define-key flat-keymap key item)
- [elpa] externals/ergoemacs-mode 4a8de51 19/87: The image is created for the current theme., (continued)
- [elpa] externals/ergoemacs-mode 4a8de51 19/87: The image is created for the current theme., Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 176af55 10/87: Take out message, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 6051ab5 25/87: Remove unicode fonts setup. Refix Issue #408, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 87fe85a 36/87: No longer try to ensure undo-tree and persistent-soft are installed, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode b4b5241 30/87: Add back ergoemacs-style shift-translation, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 1421a65 06/87: Change how key prefixes are handled., Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 59235bb 12/87: Allow ergoemacs-mode to handle ending <apps> keys, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 27c6245 05/87: Remove helm-do-grep. Its no longer found in helm, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode b70d9fe 43/87: Fix back quote., Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode d5d2ba4 39/87: Create extras directory. See Issue #452, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode f5aa0f7 63/87: Merge pull request #496 from wlandry/command_loop,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode 10007d2 64/87: Preserve the behavior of 'space' when rebinding inside a minibuffer, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode ad3ec45 73/87: Fix describe-ergoemacs-theme and consolidate menu items, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode eaf2812 79/87: Suppress more warnings, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 347070d 76/87: Some changes, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 19fea7e 77/87: Fix byte compile of ergoemacs-command-loop, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode fc097bd 82/87: Update copyright year, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode e79d33c 28/87: Rename ergoemacs-swiper to swiper. Issue #445, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode d36e6390 24/87: Defer ergoemacs override setup, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 7e31354 33/87: Merge pull request #450 from MicroAnibal/PotugueseLayout, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 9acd205 34/87: Fix Issue #451 by coding a new old binding function, Stefan Monnier, 2021/04/14