From dd0c5bbb364c8a7f6c663c7bd93d048206b2e707 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 16 Nov 2012 13:02:39 -0500 Subject: * lisp/emacs-lisp/advice.el (ad-make-advised-definition): Improve last fix. --- lisp/emacs-lisp/advice.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/advice.el') diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 60c1a846a79..c2ebb3bbdc6 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -2596,7 +2596,9 @@ in any of these classes." (ad-has-redefining-advice function)) (let* ((origdef (ad-real-orig-definition function)) ;; Construct the individual pieces that we need for assembly: - (orig-arglist (and origdef (ad-arglist origdef))) + (orig-arglist (let ((args (ad-arglist origdef))) + ;; The arglist may still be unknown. + (if (listp args) args '(&rest args)))) (advised-arglist (or (ad-advised-arglist function) orig-arglist)) (interactive-form (ad-advised-interactive-form function)) -- cgit v1.2.3