diff options
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ert-x.el | 5 |
3 files changed, 9 insertions, 2 deletions
@@ -1427,7 +1427,10 @@ Use `filter-buffer-substring-functions' instead. --- *** `byte-compile-disable-print-circle' is obsolete. +--- *** `deferred-action-list' and `deferred-action-function' are obsolete. +Use `post-command-hook' instead. + +++ *** `font-lock-maximum-size' is obsolete. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2d618c6454c..24fb682235c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-02-04 Glenn Morris <rgm@gnu.org> + * emacs-lisp/ert-x.el (ert-simulate-command): + Check deferred-action-list (which is obsolete) is bound. + * subr.el (with-wrapper-hook): Doc fixes. * simple.el (filter-buffer-substring-functions) 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) |