emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit 16b313ba47: magit-turn-on-auto-revert-mode-if-d


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 16b313ba47: magit-turn-on-auto-revert-mode-if-desired: do cheaper checks first
Date: Thu, 3 Feb 2022 20:58:10 -0500 (EST)

branch: elpa/git-commit
commit 16b313ba47872613c735863e9ece4193d4fc0ec4
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>

    magit-turn-on-auto-revert-mode-if-desired: do cheaper checks first
    
    If we are not going to do anything because auto-revert-mode or
    global-auto-revert-mode are on, don't call `executable-find',
    `file-readable-p' or `magit-toplevel'.  This is particular important for
    remote files, for which calling those functions is expensive.
---
 lisp/magit-autorevert.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/magit-autorevert.el b/lisp/magit-autorevert.el
index c998d7a686..cb7891e59a 100644
--- a/lisp/magit-autorevert.el
+++ b/lisp/magit-autorevert.el
@@ -105,7 +105,9 @@ seconds of user inactivity.  That is not desirable."
       (--when-let (find-buffer-visiting file)
         (with-current-buffer it
           (magit-turn-on-auto-revert-mode-if-desired)))
-    (when (and buffer-file-name
+    (when (and (not auto-revert-mode)        ; see #3014
+               (not global-auto-revert-mode) ; see #3460
+               buffer-file-name
                (file-readable-p buffer-file-name)
                (or (< emacs-major-version 27)
                    (with-no-warnings
@@ -114,9 +116,7 @@ seconds of user inactivity.  That is not desirable."
                        (wrong-number-of-arguments t)))) ; very old 27 built
                (magit-toplevel)
                (or (not magit-auto-revert-tracked-only)
-                   (magit-file-tracked-p buffer-file-name))
-               (not auto-revert-mode)         ; see #3014
-               (not global-auto-revert-mode)) ; see #3460
+                   (magit-file-tracked-p buffer-file-name)))
       (auto-revert-mode 1))))
 
 ;;;###autoload



reply via email to

[Prev in Thread] Current Thread [Next in Thread]