summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2024-05-26 14:30:54 +0200
committerAlan Pearce2024-05-26 14:31:20 +0200
commita1edb7d39b6561a493c151a47b24cddf5378f1f9 (patch)
tree194f2265e9c51d35902535b48b8b10f044f8929a /user
parent1ed058069a5f72257bd775a73022bfa6b17a29ba (diff)
downloadnixfiles-a1edb7d39b6561a493c151a47b24cddf5378f1f9.tar.lz
nixfiles-a1edb7d39b6561a493c151a47b24cddf5378f1f9.tar.zst
nixfiles-a1edb7d39b6561a493c151a47b24cddf5378f1f9.zip
emacs: insist that magit should not enable magit-auto-revert-mode
seems as though it should have been fixed in
https://github.com/magit/magit/pull/4891, which is the case for the
test provided there, but does not seem to be the case for me
Diffstat (limited to 'user')
-rw-r--r--user/emacs/init.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index a69fe8d1..438e5487 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -646,11 +646,10 @@ _C-k_: prev  _u_pper              _=_: upper/lower       _s_mart resolve
 ;;;; Auto-reloading
 
 (use-package autorevert
-  :defer 1
   :config (progn
             (setq auto-revert-verbose nil
                   auto-revert-use-notify t)
-            (global-auto-revert-mode t)))
+            (global-auto-revert-mode 1)))
 
 (setq delete-by-moving-to-trash t)
 
@@ -1001,12 +1000,15 @@ _C-k_: prev  _u_pper              _=_: upper/lower       _s_mart resolve
   :general ([remap project-vc-dir] #'magit-project-status)
   (:keymaps 'project-prefix-map "m" #'magit-project-status)
   :init (progn
+          (defvar magit-auto-revert-mode nil)
+          (setq magit-auto-revert-mode nil)
           (require 'project)
           (add-to-list 'project-switch-commands '(magit-project-status "Magit") t))
   :config (progn
             (setq magit-section-visibility-indicator nil
                   magit-diff-refine-hunk t
-                  magit-auto-revert-immediately t
+                  magit-auto-revert-mode nil
+                  magit-auto-revert-immediately nil ; unnecessary when global-auto-revert-mode is enabled
                   magit-display-buffer-function #'magit-display-buffer-fullcolumn-most-v1)
             (remove-hook 'magit-status-sections-hook 'magit-insert-tags-header)
             (remove-hook 'magit-section-highlight-hook 'magit-section-highlight)