From 5ee7aeae973ee06c33aa193aac879764acbbc484 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 13 Feb 2017 04:53:42 -0500 Subject: [PATCH] Move git-gutter config from ui/doom to feature/version-control --- modules/feature/version-control/+git.el | 13 +++++++++++++ modules/ui/doom/config.el | 15 --------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el index 20f88ffc2..61dbf4776 100644 --- a/modules/feature/version-control/+git.el +++ b/modules/feature/version-control/+git.el @@ -19,6 +19,19 @@ ;; Update git-gutter on focus (in case I was using git externally) (add-hook 'focus-in-hook 'git-gutter:update-all-windows) + ;; places the git gutter outside the margins. + (setq-default fringes-outside-margins t) + ;; thin fringe bitmaps + (define-fringe-bitmap 'git-gutter-fr:added + [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224] + nil nil 'center) + (define-fringe-bitmap 'git-gutter-fr:modified + [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224] + nil nil 'center) + (define-fringe-bitmap 'git-gutter-fr:deleted + [0 0 0 0 0 0 0 0 0 0 0 0 0 128 192 224 240 248] + nil nil 'center) + (@after evil ;; Refreshing git-gutter on ESC (advice-add 'evil-force-normal-state :after 'git-gutter))) diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el index 9dd6e5d96..15832d0cf 100644 --- a/modules/ui/doom/config.el +++ b/modules/ui/doom/config.el @@ -87,18 +87,3 @@ (overlay-put ov 'display (propertize " [...] " 'face 'doom-folded-face)))))) - -;; Show diffs with subtle lines in the fringe -(@after git-gutter-fringe - ;; places the git gutter outside the margins. - (setq-default fringes-outside-margins t) - ;; thin fringe bitmaps - (define-fringe-bitmap 'git-gutter-fr:added - [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224] - nil nil 'center) - (define-fringe-bitmap 'git-gutter-fr:modified - [224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224 224] - nil nil 'center) - (define-fringe-bitmap 'git-gutter-fr:deleted - [0 0 0 0 0 0 0 0 0 0 0 0 0 128 192 224 240 248] - nil nil 'center))