From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 4 Dec 2021 04:24:54 +0000 (+0100)
Subject: Fix keymap-lookup implementation
X-Git-Tag: emacs-29.0.90~3619^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55ff91e822b3ffaf43ef2330aba33f2ba85ea12a;p=emacs.git

Fix keymap-lookup implementation

* lisp/keymap.el (keymap-lookup): Make this actually work for
looking up keys.
---

diff --git a/lisp/keymap.el b/lisp/keymap.el
index 07e43c37b36..48f087c5287 100644
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -407,10 +407,10 @@ be a number or marker, in which case the keymap properties at the
 specified buffer position instead of point are used."
   (declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
   (keymap--check key)
-  (when (and keymap (not position))
+  (when (and keymap position)
     (error "Can't pass in both keymap and position"))
   (if keymap
-      (let ((value (lookup-key (key-parse key) keymap accept-default)))
+      (let ((value (lookup-key keymap (key-parse key) accept-default)))
         (when (and (not no-remap)
                    (symbolp value))
           (or (command-remapping value) value)))