Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

2 files changed, 14 insertions, 2 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c970a3c55d1..9d8b23b6b5b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1696,6 +1696,11 @@ the new variable 'buffer-auto-revert-by-notification' to a non-nil
 value.  Auto Revert mode can use this information to avoid polling the
 buffer periodically when 'auto-revert-avoid-polling' is non-nil.
 
+---
+*** `global-auto-revert-ignore-buffer' can now also be a predicate
+function that can be used for more fine-grained control of which
+buffers to auto-revert.
+
 ** auth-source-pass
 
 +++
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 5c79a7e7955..6cdc1d3a297 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -266,7 +266,10 @@ buffers.  CPU usage depends on the version control system."
 
 (defvar-local global-auto-revert-ignore-buffer nil
   "When non-nil, Global Auto-Revert Mode will not revert this buffer.
-This variable becomes buffer local when set in any fashion.")
+This variable can also be a predicate function, in which case
+it'll be called with one parameter (the buffer in question), and
+it should return non-nil to make Global Auto-Revert Mode not
+revert this buffer.")
 
 (defcustom auto-revert-remote-files nil
   "If non-nil remote files are also reverted."
@@ -541,7 +544,11 @@ specifies in the mode line."
                       (not (eq buffer-stale-function
                                #'buffer-stale--default-function))))
              (not (memq 'major-mode global-auto-revert-ignore-modes))
-             (not global-auto-revert-ignore-buffer))
+             (or (null global-auto-revert-ignore-buffer)
+                 (if (functionp global-auto-revert-ignore-buffer)
+                     (not (funcall global-auto-revert-ignore-buffer
+                                   (current-buffer)))
+                   nil)))
     (setq auto-revert--global-mode t)))
 
 (defun auto-revert--global-adopt-current-buffer ()