Fix auto-revert-tail-mode for remote files

Fixes: debbugs:19449
* autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode for
  remote files (bug#19449)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd7959ea3487fff5769b1e632c012b99db02dd41..663526c382c0224fd6d9949e5607d33053b5b6f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-29  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+       * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode for remote files (bug#19449)
+
 2014-12-28  Eli Zaretskii  <eliz@gnu.org>
 
        * international/mule.el (define-coding-system): Fix typos in the

diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f1074e22e51099ae88407754b45cd086280a6ad8..08c5452c8fdf014dc40781bf96dc91994d8399fe 100644 (file)
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -589,8 +589,8 @@ This is an internal function used by Auto-Revert Mode."
           ;; the values.
           (remote-file-name-inhibit-cache t)
           (revert
-           (or (and buffer-file-name
-                    (or auto-revert-remote-files
+           (if buffer-file-name
+               (and (or auto-revert-remote-files
                         (not (file-remote-p buffer-file-name)))
                     (or (not auto-revert-use-notify)
                         auto-revert-notify-modified-p)
@@ -603,11 +603,11 @@ This is an internal function used by Auto-Revert Mode."
                       (funcall (or buffer-stale-function
                                     #'buffer-stale--default-function)
                                 t)))
-               (and (or auto-revert-mode
-                        global-auto-revert-non-file-buffers)
-                    (funcall (or buffer-stale-function
-                                  #'buffer-stale--default-function)
-                              t))))
+             (and (or auto-revert-mode
+                      global-auto-revert-non-file-buffers)
+                  (funcall (or buffer-stale-function
+                               #'buffer-stale--default-function)
+                           t))))
           eob eoblist)
       (setq auto-revert-notify-modified-p nil)
       (when revert
@@ -690,8 +690,7 @@ the timer when no buffers need to be checked."
     (let ((bufs (if global-auto-revert-mode
                    (buffer-list)
                  auto-revert-buffer-list))
-         (remaining ())
-         (new ()))
+         remaining new)
       ;; Partition `bufs' into two halves depending on whether or not
       ;; the buffers are in `auto-revert-remaining-buffers'.  The two
       ;; halves are then re-joined with the "remaining" buffers at the