daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Daniel Weschke
2025-07-01 14:50:19 +02:00
parent 43e02dee33
commit 73a9ab93c7
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
settings/version-control-settings.el
View File

@@ -52,25 +52,22 @@
(use-package orgit (use-package orgit
:after (magit org)) :after (magit org))
;; show diffs in fringes
(use-package diff-hl (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) :hook (((prog-mode vc-dir-mode org-mode) . turn-on-diff-hl-mode)
(magit-pre-refresh . diff-hl-magit-pre-refresh) (magit-pre-refresh . diff-hl-magit-pre-refresh)
(magit-post-refresh . diff-hl-magit-post-refresh)) (magit-post-refresh . diff-hl-magit-post-refresh))
;;:config :commands (diff-hl-mode global-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 (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 :after diff-hl
:unless (display-graphic-p) :unless (display-graphic-p)
:hook ((diff-hl-mode . diff-hl-margin-mode)) :hook ((diff-hl-mode . diff-hl-margin-mode)))
;;:config
)
(provide 'version-control-settings) (provide 'version-control-settings)
;;; version-control-settings.el ends here ;;; version-control-settings.el ends here