2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7674881dd7b..41252ee85a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/advice.el (ad-make-advised-definition): Improve last fix.
+
         * emacs-lisp/cl-lib.el: Set more meaningful version number.
 
 2012-11-16  Martin Rudalics  <rudalics@gmx.at>
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))