aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-09-05 08:50:34 -0700
committerPaul Eggert2015-09-05 08:51:21 -0700
commit6d2a3ca2fc60d89a2454a0ee6cd4e814801e4e39 (patch)
treeded9919f51f90f5834290b4e2bb70bafee751afb
parentdfc8f093f30e84a76a1f0abd039e26cc7b0b6fbb (diff)
downloademacs-6d2a3ca2fc60d89a2454a0ee6cd4e814801e4e39.tar.gz
emacs-6d2a3ca2fc60d89a2454a0ee6cd4e814801e4e39.zip
Fix describe-function keybinding confusion
* lisp/help-fns.el (describe-function-1): Compute signature in the original buffer, not in standard-output, so that substitute-command-keys uses the proper keybindings. This fixes Bug#21412, introduced in commit 2015-06-11T10:23:46-0700!eggert@cs.ucla.edu.
-rw-r--r--lisp/help-fns.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index a1d121c457f..f5c7eb30c8c 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -614,9 +614,9 @@ FILE is the file where FUNCTION was probably defined."
614 (autoload-do-load real-def)) 614 (autoload-do-load real-def))
615 615
616 (help-fns--key-bindings function) 616 (help-fns--key-bindings function)
617 (with-current-buffer standard-output 617 (let ((doc (help-fns--signature function doc-raw sig-key
618 (let ((doc (help-fns--signature function doc-raw sig-key 618 real-function nil)))
619 real-function nil))) 619 (with-current-buffer standard-output
620 (run-hook-with-args 'help-fns-describe-function-functions function) 620 (run-hook-with-args 'help-fns-describe-function-functions function)
621 (insert "\n" 621 (insert "\n"
622 (or doc "Not documented.")))))))) 622 (or doc "Not documented."))))))))