(find-function-noselect): Call symbol-file with `defun'.

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

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 2a58c10f82746d78cd89dc331c97b694d304b936..a70adb4d42327746c489bd826dbfeb82d60aa066 100644 (file)
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -242,7 +242,7 @@ in `load-path'."
     (let ((library
           (cond ((eq (car-safe def) 'autoload)
                  (nth 1 def))
-                ((symbol-file function)))))
+                ((symbol-file function 'defun)))))
       (find-function-search-for-symbol function nil library))))
 
 (defalias 'function-at-point 'function-called-at-point)
@@ -347,8 +347,7 @@ The library where VARIABLE is defined is searched for in FILE or
 `find-function-source-path', if non nil, otherwise in `load-path'."
   (if (not variable)
       (error "You didn't specify a variable"))
-  ;; Fixme: I think `symbol-file' should be fixed instead.  -- fx
-  (let ((library (or file (symbol-file (cons 'defvar variable)))))
+  (let ((library (or file (symbol-file variable 'defvar))))
     (find-function-search-for-symbol variable 'variable library)))
 
 ;;;###autoload