From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 10 Dec 2021 12:11:26 +0000 (+0100)
Subject: Make keymap-lookup work for keymap results, too
X-Git-Tag: emacs-29.0.90~3605^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79825f724f5d04820d154725f83186efaa2b90e8;p=emacs.git

Make keymap-lookup work for keymap results, too

* lisp/keymap.el (keymap-lookup): Make this function work for
non-symbol lookups, too (bug#52374).
---

diff --git a/lisp/keymap.el b/lisp/keymap.el
index 48f087c5287..fd91689f887 100644
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -411,9 +411,10 @@ specified buffer position instead of point are used."
     (error "Can't pass in both keymap and position"))
   (if keymap
       (let ((value (lookup-key keymap (key-parse key) accept-default)))
-        (when (and (not no-remap)
+        (if (and (not no-remap)
                    (symbolp value))
-          (or (command-remapping value) value)))
+            (or (command-remapping value) value)
+          value))
     (key-binding (kbd key) accept-default no-remap position)))
 
 (defun keymap-local-lookup (keys &optional accept-default)