From 03507476ec024086d4ab8b48597106db38c39c37 Mon Sep 17 00:00:00 2001 From: Daniel Weschke Date: Sun, 16 Jan 2022 22:26:01 +0100 Subject: [PATCH] diff-hl also for terminal --- settings/version-control-settings.el | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/settings/version-control-settings.el b/settings/version-control-settings.el index 7a10e4d7..3a99766e 100644 --- a/settings/version-control-settings.el +++ b/settings/version-control-settings.el @@ -55,6 +55,7 @@ (use-package orgit :after (magit org)) +;; show diffs in fringes (use-package diff-hl :load-path (lambda() (concat config-dir "lisp/diff-hl")) :hook (((prog-mode vc-dir-mode org-mode) . turn-on-diff-hl-mode) @@ -64,5 +65,16 @@ ;;(global-diff-hl-mode) ) +;; There's no fringe when Emacs is running in the console, but the +;; navigation and revert commands still work. Consider turning +;; diff-hl-margin-mode on, to show the indicators in the margin +;; instead. +(use-package diff-hl-margin + :after diff-hl + :unless (display-graphic-p) + :hook ((diff-hl-mode . diff-hl-margin-mode)) + ;;:config + ) + (provide 'version-control-settings) ;;; version-control-settings.el ends here