Look up keybindings in correct buffer in describe-function.

* lisp/help-fns.el (help-fns--key-bindings): New parameter.
Use it when looking up keybindings.
(describe-function-1): Add the buffer in which the command
was invoked as argument to 'help-fns--key-bindings'.
Fixes bug#57568.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index bb5b3bb71ff54ac53d7b8a3e9fb8597c467a046e..3f3a5747dc2dc1d2044835c615e24d1a0efea082 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -510,13 +510,15 @@ the C sources, too."
             (src-file (locate-library file-name t nil 'readable)))
        (and src-file (file-readable-p src-file) src-file))))))
 
-(defun help-fns--key-bindings (function)
+(defun help-fns--key-bindings (function orig-buffer)
   (when (commandp function)
     (let ((pt2 (with-current-buffer standard-output (point)))
           (remapped (command-remapping function)))
       (unless (memq remapped '(ignore undefined))
-        (let* ((all-keys (where-is-internal
-                          (or remapped function) overriding-local-map nil nil))
+        (let* ((all-keys
+                (with-current-buffer orig-buffer
+                  (where-is-internal
+                   (or remapped function) overriding-local-map nil nil)))
                (seps (seq-group-by
                       (lambda (key)
                         (and (vectorp key)
@@ -1129,7 +1131,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
          (string-match "\\([^\\]=\\|[^=]\\|\\`\\)\\\\[[{<]" doc-raw)
          (autoload-do-load real-def))
 
-    (help-fns--key-bindings function)
+    (help-fns--key-bindings function describe-function-orig-buffer)
     (with-current-buffer standard-output
       (let ((doc (condition-case nil
                      ;; FIXME: Maybe `help-fns--signature' should return `doc'