aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/autorevert.el17
2 files changed, 11 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c510771264..610a237b050 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-01-27 Michael Albinus <michael.albinus@gmx.de>
2
3 * autorevert.el (auto-revert-handler): Notifications which result
4 from a saved file shall not be taken into account. (Bug#13557)
5
12013-01-26 Andreas Schwab <schwab@linux-m68k.org> 62013-01-26 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add optional 8 * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add optional
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 25a953e1719..9270b98ac83 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -612,21 +612,16 @@ This is an internal function used by Auto-Revert Mode."
612 (or (and buffer-file-name 612 (or (and buffer-file-name
613 (or auto-revert-remote-files 613 (or auto-revert-remote-files
614 (not (file-remote-p buffer-file-name))) 614 (not (file-remote-p buffer-file-name)))
615 (or (not auto-revert-use-notify)
616 auto-revert-notify-modified-p)
615 (if auto-revert-tail-mode 617 (if auto-revert-tail-mode
616 (and (or (not auto-revert-use-notify) 618 (and (file-readable-p buffer-file-name)
617 auto-revert-notify-modified-p)
618 (file-readable-p buffer-file-name)
619 (/= auto-revert-tail-pos 619 (/= auto-revert-tail-pos
620 (setq size 620 (setq size
621 (nth 7 (file-attributes 621 (nth 7 (file-attributes
622 buffer-file-name))))) 622 buffer-file-name)))))
623 ;; When `auto-revert-use-notify' is set, we do 623 (and (file-readable-p buffer-file-name)
624 ;; not apply further checks for performance 624 (not (verify-visited-file-modtime buffer)))))
625 ;; reasons.
626 (if auto-revert-use-notify
627 auto-revert-notify-modified-p
628 (and (file-readable-p buffer-file-name)
629 (not (verify-visited-file-modtime buffer))))))
630 (and (or auto-revert-mode 625 (and (or auto-revert-mode
631 global-auto-revert-non-file-buffers) 626 global-auto-revert-non-file-buffers)
632 revert-buffer-function 627 revert-buffer-function
@@ -634,8 +629,8 @@ This is an internal function used by Auto-Revert Mode."
634 (functionp buffer-stale-function) 629 (functionp buffer-stale-function)
635 (funcall buffer-stale-function t)))) 630 (funcall buffer-stale-function t))))
636 eob eoblist) 631 eob eoblist)
632 (setq auto-revert-notify-modified-p nil)
637 (when revert 633 (when revert
638 (setq auto-revert-notify-modified-p nil)
639 (when (and auto-revert-verbose 634 (when (and auto-revert-verbose
640 (not (eq revert 'fast))) 635 (not (eq revert 'fast)))
641 (message "Reverting buffer `%s'." (buffer-name))) 636 (message "Reverting buffer `%s'." (buffer-name)))