summary refs log tree commit diff stats
path: root/user/emacs
diff options
context:
space:
mode:
authorAlan Pearce2020-11-14 21:53:11 +0100
committerAlan Pearce2020-11-14 21:53:11 +0100
commit53aeaffd2f9fc6ec415fbcf787c8133a669242cf (patch)
tree0f2515c1e7de57c50574e5e161fd493c77519cd7 /user/emacs
parentba3fc875bd0c5d0eeb2d0aa40e5ebfb219c48190 (diff)
downloadnixfiles-53aeaffd2f9fc6ec415fbcf787c8133a669242cf.tar.lz
nixfiles-53aeaffd2f9fc6ec415fbcf787c8133a669242cf.tar.zst
nixfiles-53aeaffd2f9fc6ec415fbcf787c8133a669242cf.zip
Emacs: fix magit error
Diffstat (limited to 'user/emacs')
-rw-r--r--user/emacs/init.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 5532d834..0b180270 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -434,12 +434,13 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 (use-package magit
   :defer 10
   :commands (magit-status magit-dispatch)
+  :init (progn
+          (setq magit-define-global-key-bindings t))
   :config (progn
             (setq magit-auto-revert-mode nil magit-section-visibility-indicator nil
                   magit-diff-refine-hunk 'all
                   magit-display-buffer-function #'display-buffer
                   magit-completing-read-function #'ivy-completing-read)
-            (global-magit-file-mode +1)
             (remove-hook 'magit-section-highlight-hook 'magit-section-highlight)
             (remove-hook 'magit-section-highlight-hook 'magit-section-highlight-selection)
             (remove-hook 'magit-section-highlight-hook 'magit-diff-highlight)))