From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Jun 2016 22:18:34 +0000 (-0400)
Subject: * lisp/emacs-lisp/nadvice.el (advice--make-docstring):
X-Git-Tag: emacs-25.1-rc1~89
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f526191;p=emacs.git

* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
Avoid mangling autoloads with unspecified arguments.  (Bug#21299)
---

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 1d4c3f0586c..1b30499bf19 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -114,7 +114,10 @@ Each element has the form (WHERE BYTECODE STACK) where:
            (usage (help-split-fundoc origdoc function)))
       (setq usage (if (null usage)
                       (let ((arglist (help-function-arglist flist)))
-                        (help--make-usage-docstring function arglist))
+                        ;; "[Arg list not available until function
+                        ;; definition is loaded]", bug#21299
+                        (if (stringp arglist) t
+                          (help--make-usage-docstring function arglist)))
                     (setq origdoc (cdr usage)) (car usage)))
       (help-add-fundoc-usage (concat docstring origdoc) usage))))