From f5261917191336d052ad8586b2d9fd62ba46c3c4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 13 Jun 2016 18:18:34 -0400 Subject: [PATCH] * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Avoid mangling autoloads with unspecified arguments. (Bug#21299) --- lisp/emacs-lisp/nadvice.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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)))) -- 2.39.2