[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#51384: 28.0.60; substitute-command-keys finds global binding for und
From: |
Robert Pluim |
Subject: |
bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap |
Date: |
Tue, 20 Sep 2022 18:41:45 +0200 |
>>>>> On Tue, 20 Sep 2022 17:51:37 +0200, Lars Ingebrigtsen <larsi@gnus.org>
>>>>> said:
Lars> 1 unexpected results:
Lars> FAILED help-tests-substitute-command-keys/keymap-change
Thatʼs doing
(test "\\<minibuffer-local-must-match-map>\\[abort-recursive-edit]"
"C-]")
and abort-recursive-edit is in the global-map, and not
minibuffer-local-must-match-map. Oops. This fixes it. If that looks ok
Iʼll push later tonight.
diff --git a/lisp/help.el b/lisp/help.el
index 0ec5b9c85b..b4b9120da3 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1208,6 +1208,12 @@ substitute-command-keys
(and keymap
(list keymap))
t))))
+ ;; If we're looking in a particular keymap which has
+ ;; no binding, then we need to redo the lookup, with
+ ;; the global map as well this time.
+ (when (and (not key) keymap)
+ (setq key (with-current-buffer orig-buf
+ (where-is-internal fun keymap t))))
(if (not key)
;; Function is not on any key.
(let ((op (point)))
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, (continued)
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Robert Pluim, 2022/09/15
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Lars Ingebrigtsen, 2022/09/16
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Robert Pluim, 2022/09/16
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Lars Ingebrigtsen, 2022/09/16
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Robert Pluim, 2022/09/20
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Lars Ingebrigtsen, 2022/09/20
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap,
Robert Pluim <=
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Stefan Kangas, 2022/09/20
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Robert Pluim, 2022/09/21
- bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap, Stefan Kangas, 2022/09/21