branch: elpa/magit
commit a48e3176d5b4b4e7eea458e7fa95038da301d0e4
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-auto-revert-mode: Disable when enabling global-auto-revert-mode
Suggested-by: Stefan Monnier <[email protected]>
---
lisp/magit-autorevert.el | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/lisp/magit-autorevert.el b/lisp/magit-autorevert.el
index 42c97bfb717..b5c9ea76cff 100644
--- a/lisp/magit-autorevert.el
+++ b/lisp/magit-autorevert.el
@@ -131,6 +131,13 @@ seconds of user inactivity. That is not desirable."
:init-value (not (or global-auto-revert-mode noninteractive))
:initialize #'magit-custom-initialize-after-init)
+(defun magit-auto-revert-mode--disable ()
+ "When enabling `global-auto-revert-mode', disable `magit-auto-revert-mode'."
+ (when (and global-auto-revert-mode magit-auto-revert-mode)
+ (magit-auto-revert-mode -1)))
+
+(add-hook 'global-auto-revert-mode-hook #'magit-auto-revert-mode--disable)
+
(put 'magit-auto-revert-mode 'function-documentation
"Toggle Magit Auto Revert mode.
