[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode 131b3fb 62/87: Fix command-loop errors
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode 131b3fb 62/87: Fix command-loop errors |
Date: |
Wed, 14 Apr 2021 18:47:08 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit 131b3fb409c79b66d6715608a71be884a0bde82f
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>
Fix command-loop errors
The problem was that mapkeymap was looking for a prefix in a keymap
and assuming that the result was a list. This will fail when invoking
'term', because it has a keymap with a lot of elements specified as
#^^[3 0 term-send-raw-meta term-send-raw-meta ...
We now check explicitly for whether the result is a list.
---
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 981ffb3 21/87: Fix Issue #437, (continued)
- [elpa] externals/ergoemacs-mode 981ffb3 21/87: Fix Issue #437, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 730306e 66/87: Merge pull request #495 from wlandry/mac_meta_alt_switch, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 4710b5f 14/87: Fix eating of the variable, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode daec6a1 38/87: May Fix Issue #453, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 7b06006 44/87: Merge pull request #465 from MicroAnibal/FixLayoutsTypo, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 3e6fea9 41/87: Possibly fix #453, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 6231ee0 47/87: Merge pull request #468 from m00natic/emacs26-fixes, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode d5d7e5b 26/87: Partial fix for C-c and C-x. See Issue #444, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 7d36565 53/87: Merge pull request #481 from TinaRussell/exclude-more-hooks, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 4e188fd 46/87: Escape quotes on use as characters in, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 131b3fb 62/87: Fix command-loop errors,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode 2091646 65/87: Merge pull request #497 from wlandry/space_in_filenames, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode dc2f666 54/87: Add info on how to get system-wide Ergoemacs bindings in macOS, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 4a6ba06 55/87: Merge pull request #488 from marlonrichert/macos, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode aa649b2 52/87: Add hooks to ergoemacs-map-properties--modify-run-mode-hooks-excluded, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode ade132c 67/87: Remap ergoemacs-paste to calc-yank in calc-mode, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 26c2150 68/87: Merge pull request #498 from wlandry/calc_yank, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 8b437ad 70/87: Merge pull request #500 from wlandry/term_fixes, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode c7907aa 69/87: In term-mode, modify both term-raw-map and current-local-map, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode ea9b60f 71/87: Make the bash bindings work, Stefan Monnier, 2021/04/14
- [elpa] externals/ergoemacs-mode 72b0292 72/87: Make ergoemacs-handle-ctl-c-or-ctl-x==only-C-c-and-C-x work, Stefan Monnier, 2021/04/14