Commit 47f01a8a authored by Katsumi Yamaoka's avatar Katsumi Yamaoka Committed by Stefan Monnier
Browse files

* 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.
parent a61428c4
2012-11-15 Katsumi Yamaoka <>
* 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 <>
* emacs-lisp/nadvice.el: Add buffer-local support to add-function.
......@@ -2597,7 +2597,7 @@ 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 (ad-arglist origdef))
(orig-arglist (and origdef (ad-arglist origdef)))
(advised-arglist (or (ad-advised-arglist function)
(interactive-form (ad-advised-interactive-form function))
......@@ -129,7 +129,7 @@ Each element has the form (WHERE BYTECODE STACK) where:
;; 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment