(describe-function-1): Call symbol-file with `defun'.

(describe-variable): Call symbol-file with `defvar'.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index f799fbd9be7d4117d5dd2a3f33a75a38807a6d95..522c1e2c19de27e578ac2b97e5d23a7aa146052a 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -355,7 +355,7 @@ face (according to `face-differs-from-default-p')."
          (if (re-search-backward "alias for `\\([^`']+\\)'" nil t)
              (help-xref-button 1 'help-function def)))))
     (or file-name
-       (setq file-name (symbol-file function)))
+       (setq file-name (symbol-file function 'defun)))
     (when (equal file-name "loaddefs.el")
       ;; Find the real def site of the preloaded function.
       ;; This is necessary only for defaliases.
@@ -614,7 +614,7 @@ it is displayed along with the global value."
            ;; Make a hyperlink to the library if appropriate.  (Don't
            ;; change the format of the buffer's initial line in case
            ;; anything expects the current format.)
-           (let ((file-name (symbol-file (cons 'defvar variable))))
+           (let ((file-name (symbol-file variable 'defvar)))
              (when (equal file-name "loaddefs.el")
                ;; Find the real def site of the preloaded variable.
                (let ((location