bug#21950: 25.1.50; find-lisp-object-file-name sometimes cannot find file-name

[Tino Calancha <f92capac@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]



* lisp/help-fns.el (find-lisp-object-file-name):
   Restrict second argument of symbol-file to just 'defvar 'defface 'defun

emacs -Q:
;; following returns nil (it should be the value of file)
(let ((alias 'd)
       (def   'dired)
       (file  (expand-file-name "test-alias-v25.1.50-tmp.el"
 			       user-emacs-directory)))
   (with-temp-file file
     (insert (format "(defalias '%s '%s)"
 		    (symbol-name alias)
 		    (symbol-name def))))
   (load-file file)
   (find-lisp-object-file-name alias def))

[-- Attachment #2: Type: text/plain, Size: 768 bytes --]

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 4e0bfee..af9b918 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -223,7 +223,10 @@ find-lisp-object-file-name
                          ;; FIXME: Why do we have this weird "If TYPE is the
                          ;; value returned by `symbol-function' for a function
                          ;; symbol" exception?
-			 object (or (if (symbolp type) type) 'defun)))))
+                       object (if (and (symbolp type)
+                                       (memq type (list 'defvar 'defface)))
+                                  type
+                                'defun)))))
     (cond
      (autoloaded
       ;; An autoloaded function: Locate the file since `symbol-function'