summaryrefslogtreecommitdiff
path: root/lisp/autorevert.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-01-22 09:12:16 +0100
committerMichael Albinus <michael.albinus@gmx.de>2018-01-22 09:12:16 +0100
commitd0fd9809d7574c67a181225fcc1c59afdbb1295c (patch)
tree9f937d58f01f4f353fe6fa9eb766dd01be0f84ea /lisp/autorevert.el
parentb3fb0d47c158cb0d1acdce5008628e1d1a337bbb (diff)
downloademacs-d0fd9809d7574c67a181225fcc1c59afdbb1295c.tar.gz
emacs-d0fd9809d7574c67a181225fcc1c59afdbb1295c.tar.bz2
emacs-d0fd9809d7574c67a181225fcc1c59afdbb1295c.zip
Finish changes in autorevert from commit 530bb2dc68
* lisp/autorevert.el (auto-revert-buffers): Check `auto-revert-timer' being a timerp. * test/lisp/filenotify-tests.el (file-notify-test04-autorevert): Adapt test in order to cover changed behavior of autorevert.
Diffstat (limited to 'lisp/autorevert.el')
-rw-r--r--lisp/autorevert.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index da8942664b7..cf145e0ee38 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -803,7 +803,8 @@ the timer when no buffers need to be checked."
;; Check if we should cancel the timer.
(when (and (not global-auto-revert-mode)
(null auto-revert-buffer-list))
- (cancel-timer auto-revert-timer)
+ (if (timerp auto-revert-timer)
+ (cancel-timer auto-revert-timer))
(setq auto-revert-timer nil)))))