summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-06-13 18:18:34 -0400
committerGlenn Morris <rgm@gnu.org>2016-06-13 18:18:34 -0400
commitf5261917191336d052ad8586b2d9fd62ba46c3c4 (patch)
tree7bbfe8785e8985c8efc039ecf936827b9dfb2af2
parente881070890d2603570af9939a4619234379758e5 (diff)
* lisp/emacs-lisp/nadvice.el (advice--make-docstring):
Avoid mangling autoloads with unspecified arguments. (Bug#21299)
-rw-r--r--lisp/emacs-lisp/nadvice.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 1d4c3f0586..1b30499bf1 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))))