From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 5 Sep 2015 15:50:34 +0000 (-0700)
Subject: Fix describe-function keybinding confusion
X-Git-Tag: emacs-25.0.90~1225^2~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d2a3ca2fc60d89a2454a0ee6cd4e814801e4e39;p=emacs.git

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.
---

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."
 	     (autoload-do-load real-def))
 
         (help-fns--key-bindings function)
-        (with-current-buffer standard-output
-	  (let ((doc (help-fns--signature function doc-raw sig-key
-                                          real-function nil)))
+        (let ((doc (help-fns--signature function doc-raw sig-key
+                                        real-function nil)))
+          (with-current-buffer standard-output
 	    (run-hook-with-args 'help-fns-describe-function-functions function)
 	    (insert "\n"
 		    (or doc "Not documented."))))))))