* lisp/help-fns.el (describe-function-1): Test for an autoload before a macro

since `macrop' works on autoloads. 

* test/automated/help-fns.el: New file.

Fixes: debbugs:17410

2 files changed, 11 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b21fd8cd66..3bbacb85e97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-05  Glenn Morris  <rgm@gnu.org>
+
+        * help-fns.el (describe-function-1): Test for an autoload before a
+        macro, since `macrop' works on autoloads.  (Bug#17410)
+
 2014-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * electric.el (electric-indent-functions-without-reindent): Add yaml.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index a186254123d..5b0739ed9ae 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1,7 +1,6 @@
 ;;; help-fns.el --- Complex help functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2014 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help, internal
@@ -479,6 +478,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
@@ -491,11 +495,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)))