aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-04-05 12:18:43 +0200
committerMichael Albinus2013-04-05 12:18:43 +0200
commit2a417372c4a06fe90c343bc59660268c7a5ac3e9 (patch)
treecd7a1b819fb1d371d810d1124d70048467d50f3c
parentfc164b0c33ea4d65e5d1da2c3925569b032b398d (diff)
downloademacs-2a417372c4a06fe90c343bc59660268c7a5ac3e9.tar.gz
emacs-2a417372c4a06fe90c343bc59660268c7a5ac3e9.zip
* 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)
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/autorevert.el11
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6da3acf9dda..b77bfb3ab4e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12013-04-05 Michael Albinus <michael.albinus@gmx.de>
2
3 * autorevert.el (auto-revert-mode, auto-revert-tail-mode)
4 (global-auto-revert-mode): Let-bind `auto-revert-use-notify' to
5 nil during initialization, in order not to miss changes since the
6 file was opened. (Bug#14140)
7
12013-04-05 Leo Liu <sdl.web@gmail.com> 82013-04-05 Leo Liu <sdl.web@gmail.com>
2 9
3 * kmacro.el (kmacro-call-macro): Fix bug#14135. 10 * kmacro.el (kmacro-call-macro): Fix bug#14135.
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index a2d70c37762..02a99ce98e7 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -367,8 +367,9 @@ without being changed in the part that is already in the buffer."
367 (delq (current-buffer) auto-revert-buffer-list))) 367 (delq (current-buffer) auto-revert-buffer-list)))
368 (auto-revert-set-timer) 368 (auto-revert-set-timer)
369 (when auto-revert-mode 369 (when auto-revert-mode
370 (auto-revert-buffers) 370 (let (auto-revert-use-notify)
371 (setq auto-revert-tail-mode nil))) 371 (auto-revert-buffers)
372 (setq auto-revert-tail-mode nil))))
372 373
373 374
374;;;###autoload 375;;;###autoload
@@ -422,7 +423,8 @@ Use `auto-revert-mode' for changes other than appends!"
422 (y-or-n-p "File changed on disk, content may be missing. \ 423 (y-or-n-p "File changed on disk, content may be missing. \
423Perform a full revert? ") 424Perform a full revert? ")
424 ;; Use this (not just revert-buffer) for point-preservation. 425 ;; Use this (not just revert-buffer) for point-preservation.
425 (auto-revert-handler)) 426 (let (auto-revert-use-notify)
427 (auto-revert-handler)))
426 ;; else we might reappend our own end when we save 428 ;; else we might reappend our own end when we save
427 (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t) 429 (add-hook 'before-save-hook (lambda () (auto-revert-tail-mode 0)) nil t)
428 (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position 430 (or (local-variable-p 'auto-revert-tail-pos) ; don't lose prior position
@@ -467,7 +469,8 @@ specifies in the mode line."
467 :global t :group 'auto-revert :lighter global-auto-revert-mode-text 469 :global t :group 'auto-revert :lighter global-auto-revert-mode-text
468 (auto-revert-set-timer) 470 (auto-revert-set-timer)
469 (if global-auto-revert-mode 471 (if global-auto-revert-mode
470 (auto-revert-buffers) 472 (let (auto-revert-use-notify)
473 (auto-revert-buffers))
471 (dolist (buf (buffer-list)) 474 (dolist (buf (buffer-list))
472 (with-current-buffer buf 475 (with-current-buffer buf
473 (when auto-revert-use-notify 476 (when auto-revert-use-notify