summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-11-30 20:42:38 -0500
committerKyle Meyer <kyle@kyleam.com>2016-11-30 20:42:38 -0500
commit9c77245b84463b647526ba75d9d89bc3159b1fea (patch)
treee676ce801ea40c6807af66fcb03ed3666cfa92fe
parentd93474a83eaa08e8a0082aeed60f0a00dad608e9 (diff)
downloademacs.d-9c77245b84463b647526ba75d9d89bc3159b1fea.tar.gz
magit: Update for margin customization changes
Magit's 186c3d6 (Make log margin more flexible and easier to configure, 2016-11-29)
-rw-r--r--init.el12
1 files changed, 9 insertions, 3 deletions
diff --git a/init.el b/init.el
index 3ecb168..1a841c0 100644
--- a/init.el
+++ b/init.el
@@ -885,9 +885,15 @@
magit-update-other-window-delay 0.1
magit-revision-show-gravatars nil
magit-revision-insert-related-refs nil
- magit-log-section-arguments nil
- magit-log-show-margin nil
- magit-reflog-show-margin nil)
+ magit-log-section-arguments nil)
+
+ (dolist (margin (list magit-cherry-margin
+ magit-log-margin
+ magit-log-select-margin
+ magit-reflog-margin
+ magit-stashes-margin))
+ (setf (nth 0 margin) nil))
+
(setq magit-uniquify-buffer-names nil
magit-buffer-name-format "*%M%v: %t*")
(setq magit-no-confirm '(stage-all-changes unstage-all-changes reverse))