* autorevert.el (auto-revert-mode, auto-revert-tail-mode)

(global-auto-revert-mode): Let-bind `auto-revert-use-notify' to
nil during initialization, in order not to miss changes since the
file was opened.  (Bug#14140)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6da3acf9dda0aa8fb63dcb2c452e40368b0c4e80..b77bfb3ab4e40365cd51e12dec5b4f4323c9120e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Michael Albinus  <michael.albinus@gmx.de>
+
+       * autorevert.el (auto-revert-mode, auto-revert-tail-mode)
+       (global-auto-revert-mode): Let-bind `auto-revert-use-notify' to
+       nil during initialization, in order not to miss changes since the
+       file was opened.  (Bug#14140)
+
 2013-04-05  Leo Liu  <sdl.web@gmail.com>
 
        * kmacro.el (kmacro-call-macro): Fix bug#14135.

diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index a2d70c37762b48a3d25de3a2f865f0856adf1bf3..02a99ce98e71ef63887b27ec2214c4604553e027 100644 (file)
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -367,8 +367,9 @@ without being changed in the part that is already in the buffer."
          (delq (current-buffer) auto-revert-buffer-list)))
   (auto-revert-set-timer)
   (when auto-revert-mode
-    (auto-revert-buffers)
-    (setq auto-revert-tail-mode nil)))
+    (let (auto-revert-use-notify)
+      (auto-revert-buffers)
+      (setq auto-revert-tail-mode nil))))
 
 
 ;;;###autoload
@@ -422,7 +423,8 @@ Use `auto-revert-mode' for changes other than appends!"
            (y-or-n-p "File changed on disk, content may be missing.  \
 Perform a full revert? ")
            ;; Use this (not just revert-buffer) for point-preservation.
-           (auto-revert-handler))
+          (let (auto-revert-use-notify)
+            (auto-revert-handler)))
       ;; else we might reappend our own end when we save
       (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t)
       (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position
@@ -467,7 +469,8 @@ specifies in the mode line."
   :global t :group 'auto-revert :lighter global-auto-revert-mode-text
   (auto-revert-set-timer)
   (if global-auto-revert-mode
-      (auto-revert-buffers)
+      (let (auto-revert-use-notify)
+       (auto-revert-buffers))
     (dolist (buf (buffer-list))
       (with-current-buffer buf
        (when auto-revert-use-notify