jimeh/.emacs.d
1
0
Fork 0
mirror of https://github.com/jimeh/.emacs.d.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(version-control): set correct diff-hl mode after desktop-read

Browse Source 
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.
This commit is contained in:
Jim Myhrberg
2021-05-15 18:22:15 +01:00
parent d3326fd1f2
commit c8196d7590
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/version-control/siren-diff-hl.el
View File

@@ -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