From efae487c94a4a3c146616a238e230ac87a6d383c Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 16 Feb 2021 22:45:57 +0000 Subject: [PATCH] feat(version-control): use diff-hl-margin-mode when running Emacs in a terminal --- modules/themes/siren-doom-themes.el | 11 +++++++++++ modules/version-control/siren-diff-hl.el | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/themes/siren-doom-themes.el b/modules/themes/siren-doom-themes.el index 7e314d4..60feb8e 100644 --- a/modules/themes/siren-doom-themes.el +++ b/modules/themes/siren-doom-themes.el @@ -90,6 +90,17 @@ :foreground (doom-blend 'vc-modified 'bg 0.7) :background (doom-blend 'vc-modified 'bg 0.2))) + (with-eval-after-load 'diff-hl-margin + (set-face-attribute 'diff-hl-margin-insert nil + :foreground (doom-blend 'vc-added 'bg 0.6) + :background (doom-blend 'vc-added 'bg 0.1)) + (set-face-attribute 'diff-hl-margin-delete nil + :foreground (doom-blend 'vc-deleted 'bg 0.7) + :background (doom-blend 'vc-deleted 'bg 0.1)) + (set-face-attribute 'diff-hl-margin-change nil + :foreground (doom-blend 'vc-modified 'bg 0.5) + :background (doom-blend 'vc-modified 'bg 0.1))) + (with-eval-after-load 'hideshowvis (set-face-attribute 'hideshowvis-hidable-face nil :foreground (doom-color 'base7))) diff --git a/modules/version-control/siren-diff-hl.el b/modules/version-control/siren-diff-hl.el index 1cbd949..4f13969 100644 --- a/modules/version-control/siren-diff-hl.el +++ b/modules/version-control/siren-diff-hl.el @@ -18,7 +18,11 @@ :init (defun siren-turn-on-diff-hl-mode () (turn-on-diff-hl-mode) - (diff-hl-flydiff-mode 1))) + (diff-hl-flydiff-mode 1)) + + :config + (if (not (window-system)) + (diff-hl-margin-mode 1))) (provide 'siren-diff-hl) ;;; siren-diff-hl.el ends here