aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-03-11 18:58:16 +0100
committerMichael Albinus2012-03-11 18:58:16 +0100
commit8f75469172437f64824113db6ff0d0c5083bfdc6 (patch)
treeb05a17dce233517cf82ad3bd878f3f60fb62aae5
parentad0bf5b6db5b1d8ea654f62675b2484111594ffc (diff)
downloademacs-8f75469172437f64824113db6ff0d0c5083bfdc6.tar.gz
emacs-8f75469172437f64824113db6ff0d0c5083bfdc6.zip
* autorevert.el (auto-revert-handler): Ensure, that
file-readable-p is applied only for local files or in auto-revert-tail-mode.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/autorevert.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e2a791f0e9..c11c60bdd6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-03-11 Michael Albinus <michael.albinus@gmx.de>
2
3 * autorevert.el (auto-revert-handler): Ensure, that
4 file-readable-p is applied only for local files or in
5 auto-revert-tail-mode.
6
12012-03-11 Andreas Schwab <schwab@linux-m68k.org> 72012-03-11 Andreas Schwab <schwab@linux-m68k.org>
2 8
3 * server.el (server-eval-at): Handle non-tcp connections. Decode 9 * server.el (server-eval-at): Handle non-tcp connections. Decode
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index c0a77bd5935..40cf79a6428 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -439,17 +439,18 @@ This is an internal function used by Auto-Revert Mode."
439 (let* ((buffer (current-buffer)) size 439 (let* ((buffer (current-buffer)) size
440 (revert 440 (revert
441 (or (and buffer-file-name 441 (or (and buffer-file-name
442 (file-readable-p buffer-file-name)
443 (if auto-revert-tail-mode 442 (if auto-revert-tail-mode
444 ;; Tramp caches the file attributes. Setting 443 ;; Tramp caches the file attributes. Setting
445 ;; `remote-file-name-inhibit-cache' forces Tramp 444 ;; `remote-file-name-inhibit-cache' forces Tramp
446 ;; to reread the values. 445 ;; to reread the values.
447 (let ((remote-file-name-inhibit-cache t)) 446 (let ((remote-file-name-inhibit-cache t))
447 (file-readable-p buffer-file-name)
448 (/= auto-revert-tail-pos 448 (/= auto-revert-tail-pos
449 (setq size 449 (setq size
450 (nth 7 (file-attributes 450 (nth 7 (file-attributes
451 buffer-file-name))))) 451 buffer-file-name)))))
452 (and (not (file-remote-p buffer-file-name)) 452 (and (not (file-remote-p buffer-file-name))
453 (file-readable-p buffer-file-name)
453 (not (verify-visited-file-modtime buffer))))) 454 (not (verify-visited-file-modtime buffer)))))
454 (and (or auto-revert-mode 455 (and (or auto-revert-mode
455 global-auto-revert-non-file-buffers) 456 global-auto-revert-non-file-buffers)