summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-02-04 13:18:46 -0800
committerGlenn Morris <rgm@gnu.org>2012-02-04 13:18:46 -0800
commitf160676e2d1ddacfa63a20859cc3c9f80b882c35 (patch)
tree0071a6b7883331554f52a8b6184b082879a12ce7 /lisp/emacs-lisp
parentc7291ad983d8494ff826b5c2eb4f5611b014de89 (diff)
downloademacs-f160676e2d1ddacfa63a20859cc3c9f80b882c35.tar.gz
emacs-f160676e2d1ddacfa63a20859cc3c9f80b882c35.tar.bz2
emacs-f160676e2d1ddacfa63a20859cc3c9f80b882c35.zip
ert-x trivia
* lisp/emacs-lisp/ert-x.el (ert-simulate-command): Check deferred-action-list (which is obsolete) is bound. * etc/NEWS: Related markup.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/ert-x.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index b9e97854349..257d0528cbc 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -167,8 +167,9 @@ test for `called-interactively' in the command will fail."
(run-hooks 'pre-command-hook)
(setq return-value (apply (car command) (cdr command)))
(run-hooks 'post-command-hook)
- (when deferred-action-list
- (run-hooks 'deferred-action-function))
+ (and (boundp 'deferred-action-list)
+ deferred-action-list
+ (run-hooks 'deferred-action-function))
(setq real-last-command (car command)
last-command this-command)
(when (boundp 'last-repeatable-command)