[Emacs-diffs] /srv/bzr/emacs/trunk r111609: * autorevert.el (auto-revert-handler): Notifications which result

[Michael Albinus]

------------------------------------------------------------
revno: 111609
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2013-01-27 11:43:33 +0100
message:
  * autorevert.el (auto-revert-handler): Notifications which result
  from a saved file shall not be taken into account.  (Bug#13557)
modified:
  lisp/ChangeLog
  lisp/autorevert.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-26 15:13:09 +0000
+++ b/lisp/ChangeLog    2013-01-27 10:43:33 +0000
@@ -1,3 +1,8 @@
+2013-01-27  Michael Albinus  <address@hidden>
+
+       * autorevert.el (auto-revert-handler): Notifications which result
+       from a saved file shall not be taken into account.  (Bug#13557)
+
 2013-01-26  Andreas Schwab  <address@hidden>
 
        * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add optional

=== modified file 'lisp/autorevert.el'
--- a/lisp/autorevert.el        2013-01-25 13:15:22 +0000
+++ b/lisp/autorevert.el        2013-01-27 10:43:33 +0000
@@ -612,21 +612,16 @@
            (or (and buffer-file-name
                     (or auto-revert-remote-files
                         (not (file-remote-p buffer-file-name)))
+                    (or (not auto-revert-use-notify)
+                        auto-revert-notify-modified-p)
                     (if auto-revert-tail-mode
-                        (and (or (not auto-revert-use-notify)
-                                 auto-revert-notify-modified-p)
-                             (file-readable-p buffer-file-name)
+                        (and (file-readable-p buffer-file-name)
                              (/= auto-revert-tail-pos
                                  (setq size
                                        (nth 7 (file-attributes
                                                buffer-file-name)))))
-                      ;; When `auto-revert-use-notify' is set, we do
-                      ;; not apply further checks for performance
-                      ;; reasons.
-                      (if auto-revert-use-notify
-                          auto-revert-notify-modified-p
-                        (and (file-readable-p buffer-file-name)
-                             (not (verify-visited-file-modtime buffer))))))
+                      (and (file-readable-p buffer-file-name)
+                           (not (verify-visited-file-modtime buffer)))))
                (and (or auto-revert-mode
                         global-auto-revert-non-file-buffers)
                     revert-buffer-function
@@ -634,8 +629,8 @@
                     (functionp buffer-stale-function)
                     (funcall buffer-stale-function t))))
           eob eoblist)
+      (setq auto-revert-notify-modified-p nil)
       (when revert
-       (setq auto-revert-notify-modified-p nil)
        (when (and auto-revert-verbose
                   (not (eq revert 'fast)))
          (message "Reverting buffer `%s'." (buffer-name)))