From 73a9ab93c7b910803398426928cb308ecd9b960d Mon Sep 17 00:00:00 2001 From: Daniel Weschke Date: Tue, 1 Jul 2025 14:50:19 +0200 Subject: [PATCH] clean up --- settings/version-control-settings.el | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/settings/version-control-settings.el b/settings/version-control-settings.el index 39cdeead..ade1eaf2 100644 --- a/settings/version-control-settings.el +++ b/settings/version-control-settings.el @@ -52,25 +52,22 @@ (use-package orgit :after (magit org)) -;; show diffs in fringes (use-package diff-hl + ;; show diffs in fringes (for margins see `diff-hl-margin') + ;; https://github.com/dgutov/diff-hl :hook (((prog-mode vc-dir-mode org-mode) . turn-on-diff-hl-mode) (magit-pre-refresh . diff-hl-magit-pre-refresh) (magit-post-refresh . diff-hl-magit-post-refresh)) - ;;:config - ;;(global-diff-hl-mode) - ) + :commands (diff-hl-mode 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 + ;; 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. :after diff-hl :unless (display-graphic-p) - :hook ((diff-hl-mode . diff-hl-margin-mode)) - ;;:config - ) + :hook ((diff-hl-mode . diff-hl-margin-mode))) (provide 'version-control-settings) ;;; version-control-settings.el ends here