From c8196d759061716bdd17df4aed6f913066dd64e0 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 15 May 2021 18:22:15 +0100 Subject: [PATCH] fix(version-control): set correct diff-hl mode after desktop-read The state of using diff-hl using the margin or fringe ends up within desktop-mode save files, so let's force set diff-hl to use margin or fringe based on if we have a window-system or not, both after diff-hl is loaded, and also as a desktop-after-read hook. --- modules/version-control/siren-diff-hl.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/version-control/siren-diff-hl.el b/modules/version-control/siren-diff-hl.el index a4719a7..cb8d7b0 100644 --- a/modules/version-control/siren-diff-hl.el +++ b/modules/version-control/siren-diff-hl.el @@ -15,6 +15,7 @@ (dired-mode . diff-hl-dired-mode) (magit-pre-refresh . diff-hl-magit-pre-refresh) (magit-post-refresh . diff-hl-magit-post-refresh) + (desktop-after-read . siren-diff-hl-set-render-mode) :custom (diff-hl-fringe-bmp-function 'siren-diff-hl-fringe-bmp-from-type) @@ -55,9 +56,11 @@ (defun siren-diff-hl-fringe-bmp-from-type(type _pos) (intern (format "siren-diff-hl-%s" type))) + (defun siren-diff-hl-set-render-mode () + (diff-hl-margin-mode (if (window-system) -1 1))) + :config - (if (not (window-system)) - (diff-hl-margin-mode 1)) + (siren-diff-hl-set-render-mode) ;; Fringe bitmaps borrowed from doom-emacs' ui/vc-gutter module (define-fringe-bitmap 'siren-diff-hl-insert