From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 4 Sep 2001 01:06:43 +0000 (+0000)
Subject: (describe-function-1): Save precomputed `file-name' rather
X-Git-Tag: emacs-pretest-21.0.106~266
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5c60e46926b53bb907833e605c85f31f26fe3cd;p=emacs.git

(describe-function-1): Save precomputed `file-name' rather
than recomputing it (incorrectly) with `symbol-file'.
---

diff --git a/lisp/help.el b/lisp/help.el
index c379fba1373..c05fcb47490 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -710,15 +710,17 @@ It can also be nil, if the definition is not associated with any file."
 	  (with-current-buffer "*Help*"
 	    (save-excursion
 	      (re-search-backward "`\\([^`']+\\)'" nil t)
-	      (help-xref-button 
-	       1 
-	       #'(lambda (arg)
+	      (help-xref-button
+	       1
+	       #'(lambda (fun file)
 		   (require 'find-func)
+		   ;; Don't use find-function-noselect because it follows
+		   ;; aliases (which fails for built-in functions).
 		   (let* ((location (find-function-search-for-symbol
-				     arg nil (symbol-file arg))))
+				     fun nil file)))
 		     (pop-to-buffer (car location))
 		     (goto-char (cdr location))))
-	       function
+	       (list function file-name)
 	       "mouse-2, RET: find function's definition")))))
     (if need-close (princ ")"))
     (princ ".")