Commit 65856ce0 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Don't turn on auto-revert-mode if global-auto-revert-mode is on

Closes #3460.
parent 67d96c61
......@@ -111,7 +111,8 @@ seconds of user inactivity. That is not desirable."
(magit-toplevel)
(or (not magit-auto-revert-tracked-only)
(magit-file-tracked-p buffer-file-name))
(not auto-revert-mode)) ; see #3014
(not auto-revert-mode) ; see #3014
(not global-auto-revert-mode)) ; see #3460
(auto-revert-mode 1))))
;;;###autoload
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment