[Emacs-diffs] /srv/bzr/emacs/trunk r110902: * lisp/emacs-lisp/advice.el (ad-make-advised-definition): Fix undefined case.

[Stefan Monnier]

------------------------------------------------------------
revno: 110902
author: Katsumi Yamaoka <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-14 22:30:25 -0500
message:
  * lisp/emacs-lisp/advice.el (ad-make-advised-definition): Fix undefined case.
  * lisp/emacs-lisp/nadvice.el (advice--make-interactive-form):
  Fix string-spec case.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/advice.el
  lisp/emacs-lisp/nadvice.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-15 03:20:49 +0000
+++ b/lisp/ChangeLog    2012-11-15 03:30:25 +0000
@@ -1,3 +1,10 @@
+2012-11-15  Katsumi Yamaoka  <address@hidden>
+
+       * emacs-lisp/nadvice.el (advice--make-interactive-form):
+       Fix string-spec case.
+
+       * emacs-lisp/advice.el (ad-make-advised-definition): Fix undefined case.
+
 2012-11-15  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/nadvice.el: Add buffer-local support to add-function.

=== modified file 'lisp/emacs-lisp/advice.el'
--- a/lisp/emacs-lisp/advice.el 2012-11-13 14:12:46 +0000
+++ b/lisp/emacs-lisp/advice.el 2012-11-15 03:30:25 +0000
@@ -2597,7 +2597,7 @@
           (ad-has-redefining-advice function))
       (let* ((origdef (ad-real-orig-definition function))
             ;; Construct the individual pieces that we need for assembly:
-            (orig-arglist (ad-arglist origdef))
+            (orig-arglist (and origdef (ad-arglist origdef)))
             (advised-arglist (or (ad-advised-arglist function)
                                  orig-arglist))
             (interactive-form (ad-advised-interactive-form function))

=== modified file 'lisp/emacs-lisp/nadvice.el'
--- a/lisp/emacs-lisp/nadvice.el        2012-11-15 03:20:49 +0000
+++ b/lisp/emacs-lisp/nadvice.el        2012-11-15 03:30:25 +0000
@@ -129,7 +129,7 @@
   ;; FIXME: The calls to interactive-form below load autoloaded functions
   ;; too eagerly.
   (let ((fspec (cadr (interactive-form function))))
-    (when (eq 'function (car fspec)) ;; Macroexpanded lambda?
+    (when (eq 'function (car-safe fspec)) ;; Macroexpanded lambda?
       (setq fspec (nth 1 fspec)))
     (if (functionp fspec)
         `(funcall ',fspec