summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/advice.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2012-11-14 22:30:25 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2012-11-14 22:30:25 -0500
commit47f01a8af9660c018cafa3a97632c8bcb2417cec (patch)
tree532b557180a4feab0705449901b5a41b59bf9eaa /lisp/emacs-lisp/advice.el
parenta61428c42db53e4b90d4bf12bb49aeec7abbd13a (diff)
downloademacs-47f01a8af9660c018cafa3a97632c8bcb2417cec.tar.gz
* 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/advice.el')
-rw-r--r--lisp/emacs-lisp/advice.el2
1 files changed, 1 insertions, 1 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))