diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-11-14 22:30:25 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-14 22:30:25 -0500 |
| commit | 47f01a8af9660c018cafa3a97632c8bcb2417cec (patch) | |
| tree | 532b557180a4feab0705449901b5a41b59bf9eaa /lisp/emacs-lisp | |
| parent | a61428c42db53e4b90d4bf12bb49aeec7abbd13a (diff) | |
| download | emacs-47f01a8af9660c018cafa3a97632c8bcb2417cec.tar.gz emacs-47f01a8af9660c018cafa3a97632c8bcb2417cec.tar.bz2 emacs-47f01a8af9660c018cafa3a97632c8bcb2417cec.zip | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/nadvice.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index f9b4491e6e0..b99e614bec5 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -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) orig-arglist)) (interactive-form (ad-advised-interactive-form function)) diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index 0c3b267f9e1..540e0166ec2 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -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 |