(auto-revert-buffer-p): Only revert dired buffers if one of

global-auto-revert-non-file-buffers or autorevert-mode is non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5aad8f695fea7cd26d4e2e31f506b276617670d..ef3893ea83b17ffe40693216d1535cc95112656b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-16  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * autorevert.el (auto-revert-buffer-p): Only revert dired buffers
+       if one of global-auto-revert-non-file-buffers or autorevert-mode
+       is non-nil.
+
 2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
 
        * subr.el (delete-dups): A better implementation from Karl Heuer
@@ -6,8 +12,7 @@
 2004-02-16  Matt Hodges  <matt@stchem.bham.ac.uk>  (tiny change)
 
        * net/telnet.el (telnet-interrupt-subjob): Move doc string to the
-       correct place.
-       * progmodes/icon.el (icon-indent-command): Ditto.
+       correct place.  * progmodes/icon.el (icon-indent-command): Ditto.
        * textmodes/paragraphs.el (repunctuate-sentences): Ditto.
 
 2004-02-16  Eli Zaretskii  <eliz@elta.co.il>
@@ -45,7 +50,7 @@
        by calls to check-field; change the call to
        rmail-output-to-rmail-file such that rmail-current-message stays
        the same to avoid wrong deletion of unseen
-       flags. 
+       flags.
        (rsf-add-contents-type): New function to convert old format
        of rmail-spam-definitions-alist into new one.
        Changed prefixes of all variables and functions from
@@ -115,7 +120,7 @@
 
 2004-02-16  Dave Love  <fx@gnu.org>
 
-       * newcomment.el (comment-insert-comment-function) 
+       * newcomment.el (comment-insert-comment-function)
        (comment-region-function, uncomment-region-function): New.
        (comment-indent): Use comment-insert-comment-function.
        (uncomment-region): Use uncomment-region-function.

diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index a720e547b208541d1e751c7e1b3e5032b76edd6f..b1f0d7b7bfa4508b6c0eeb9ffe9a306cc35bc253 100644 (file)
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -297,10 +297,13 @@ Use `auto-revert-mode' to revert a particular buffer."
 
 (defun auto-revert-buffer-p ()
   "Check if current buffer should be reverted."
-  ;;  - Always include dired buffers to list. It would be too expensive
+  ;;  - Always include dired buffers to list.  It would be too expensive
   ;;  to test the "revert" status here each time timer launches.
   ;;  - Same for VC buffers.
-  (or (eq major-mode 'dired-mode)
+  (or (and (eq major-mode 'dired-mode)
+          (or (and global-auto-revert-mode
+                   global-auto-revert-non-file-buffers)
+              auto-revert-mode))
       (and (not (buffer-modified-p))
           (auto-revert-vc-buffer-p))
       (and (not (buffer-modified-p))