* 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, 41 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 7d4e9d5e687..a02b8e80395 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-05  Glenn Morris  <rgm@gnu.org>
+
+        * automated/help-fns.el: New file.
+
 2014-04-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/tramp-tests.el (top):
diff --git a/test/automated/help-fns.el b/test/automated/help-fns.el
new file mode 100644
index 00000000000..153de7f9e30
--- /dev/null
+++ b/test/automated/help-fns.el
@@ -0,0 +1,37 @@
+;;; help-fns.el --- tests for help-fns.el
+
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+
+;; Maintainer: emacs-devel@gnu.org
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+
+(autoload 'help-fns-test--macro "help-fns" nil nil t)
+
+(ert-deftest help-fns-test-bug17410 ()
+  "Test for http://debbugs.gnu.org/17410 ."
+  (describe-function 'help-fns-test--macro)
+  (with-current-buffer "*Help*"
+    (goto-char (point-min))
+    (should (search-forward "autoloaded Lisp macro" (line-end-position)))))
+
+;;; help-fns.el ends here