X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/559836fbccf9c79c621da96fe8ca0080b980b14c..f0ee9096ba9f35b9e6b85fb5c5f5f56168a67824:/lisp/help-fns.el

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index da4a230468..248e505ad7 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -483,7 +483,7 @@ FILE is the file where FUNCTION was probably defined."
 	 (beg (if (and (or (byte-code-function-p def)
 			   (keymapp def)
 			   (memq (car-safe def) '(macro lambda closure)))
-		       file-name
+		       (stringp file-name)
 		       (help-fns--autoloaded-p function file-name))
 		  (if (commandp def)
 		      "an interactive autoloaded "
@@ -501,6 +501,11 @@ FILE is the file where FUNCTION was probably defined."
 		 ;; aliases before functions.
 		 (aliased
 		  (format "an alias for `%s'" real-def))
+		 ((autoloadp def)
+		  (format "%s autoloaded %s"
+			  (if (commandp def) "an interactive" "an")
+			  (if (eq (nth 4 def) 'keymap) "keymap"
+			    (if (nth 4 def) "Lisp macro" "Lisp function"))))
 		 ((or (eq (car-safe def) 'macro)
 		      ;; For advised macros, def is a lambda
 		      ;; expression or a byte-code-function-p, so we
@@ -513,11 +518,6 @@ FILE is the file where FUNCTION was probably defined."
 		  (concat beg "Lisp function"))
 		 ((eq (car-safe def) 'closure)
 		  (concat beg "Lisp closure"))
-		 ((autoloadp def)
-		  (format "%s autoloaded %s"
-			  (if (commandp def) "an interactive" "an")
-			  (if (eq (nth 4 def) 'keymap) "keymap"
-			    (if (nth 4 def) "Lisp macro" "Lisp function"))))
 		 ((keymapp def)
 		  (let ((is-full nil)
 			(elts (cdr-safe def)))