From d400628bc56b989334234ce8cca57996464cdcea Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 6 Dec 2016 22:07:57 -0500 Subject: magit: Update for margin changes Magit bb8626d (Merge branch 'margin' [#2885], 2016-12-05) --- init.el | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index c49582e..df8c174 100644 --- a/init.el +++ b/init.el @@ -878,6 +878,7 @@ ("s" . magit-stage-file)) (define-key km/git-map "w" 'km/magit-wip-map) (setq magit-push-current-set-remote-if-missing nil) + (setq magit-log-margin '(nil age magit-log-margin-width t 18)) :config (setq magit-push-always-verify nil magit-delete-by-moving-to-trash nil @@ -892,13 +893,6 @@ (lambda (x) (string-prefix-p "-n" x)) magit-log-arguments))) - (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)) -- cgit v1.2.3