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

chore(version-control): unpin diff-hl as recent performance issue has been fixed

Browse Source
This commit is contained in:
Jim Myhrberg
2021-04-08 00:00:57 +01:00
parent ce69e7487a
commit fd0e04ac02
3 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,68 +8,64 @@
(require 'siren-magit)
(let ((straight-current-profile 'pinned))
(straight-x-pin-package
"diff-hl" "4c46b3b9851c85d15bff1e3ec92e5fc6043322bc")
(use-package diff-hl
:hook
(prog-mode . siren-turn-on-diff-hl-mode)
(text-mode . siren-turn-on-diff-hl-mode)
(dired-mode . diff-hl-dired-mode)
(magit-pre-refresh . diff-hl-magit-pre-refresh)
(magit-post-refresh . diff-hl-magit-post-refresh)
(use-package diff-hl
:hook
(prog-mode . siren-turn-on-diff-hl-mode)
(text-mode . siren-turn-on-diff-hl-mode)
(dired-mode . diff-hl-dired-mode)
(magit-pre-refresh . diff-hl-magit-pre-refresh)
(magit-post-refresh . diff-hl-magit-post-refresh)
:custom
(diff-hl-fringe-bmp-function 'siren-diff-hl-fringe-bmp-from-type)
(diff-hl-fringe-face-function 'siren-diff-hl-fringe-face-from-type)
(diff-hl-margin-symbols-alist
'((insert . "+")
(delete . "-")
(change . "=")
(unknown . "?")
(ignored . "i")))
:custom
(diff-hl-fringe-bmp-function 'siren-diff-hl-fringe-bmp-from-type)
(diff-hl-fringe-face-function 'siren-diff-hl-fringe-face-from-type)
(diff-hl-margin-symbols-alist
'((insert . "+")
(delete . "-")
(change . "=")
(unknown . "?")
(ignored . "i")))
:init
(defun siren-turn-on-diff-hl-mode ()
(turn-on-diff-hl-mode)
(diff-hl-flydiff-mode 1))
:init
(defun siren-turn-on-diff-hl-mode ()
(turn-on-diff-hl-mode)
(diff-hl-flydiff-mode 1))
(defgroup siren-diff-hl nil
"Siren specific tweaks to diff-hl.")
(defgroup siren-diff-hl nil
"Siren specific tweaks to diff-hl.")
(defface siren-diff-hl-insert
'((default :inherit diff-hl-insert))
"Face used to highlight inserted lines."
:group 'siren-diff-hl)
(defface siren-diff-hl-insert
'((default :inherit diff-hl-insert))
"Face used to highlight inserted lines."
:group 'siren-diff-hl)
(defface siren-diff-hl-delete
'((default :inherit diff-hl-delete))
"Face used to highlight deleted lines."
:group 'siren-diff-hl)
(defface siren-diff-hl-delete
'((default :inherit diff-hl-delete))
"Face used to highlight deleted lines."
:group 'siren-diff-hl)
(defface siren-diff-hl-change
'((default :inherit diff-hl-change))
"Face used to highlight changed lines."
:group 'siren-diff-hl)
(defface siren-diff-hl-change
'((default :inherit diff-hl-change))
"Face used to highlight changed lines."
:group 'siren-diff-hl)
(defun siren-diff-hl-fringe-face-from-type (type _pos)
(intern (format "siren-diff-hl-%s" type)))
(defun siren-diff-hl-fringe-face-from-type (type _pos)
(intern (format "siren-diff-hl-%s" type)))
(defun siren-diff-hl-fringe-bmp-from-type(type _pos)
(intern (format "siren-diff-hl-%s" type)))
(defun siren-diff-hl-fringe-bmp-from-type(type _pos)
(intern (format "siren-diff-hl-%s" type)))
:config
(if (not (window-system))
(diff-hl-margin-mode 1))
:config
(if (not (window-system))
(diff-hl-margin-mode 1))
;; Fringe bitmaps borrowed from doom-emacs' ui/vc-gutter module
(define-fringe-bitmap 'siren-diff-hl-insert
[#b00000011] nil nil '(center repeated))
(define-fringe-bitmap 'siren-diff-hl-change
[#b00000011] nil nil '(center repeated))
(define-fringe-bitmap 'siren-diff-hl-delete
[#b00000011] nil nil '(center repeated))))
;; Fringe bitmaps borrowed from doom-emacs' ui/vc-gutter module
(define-fringe-bitmap 'siren-diff-hl-insert
[#b00000011] nil nil '(center repeated))
(define-fringe-bitmap 'siren-diff-hl-change
[#b00000011] nil nil '(center repeated))
(define-fringe-bitmap 'siren-diff-hl-delete
[#b00000011] nil nil '(center repeated)))
(provide 'siren-diff-hl)
;;; siren-diff-hl.el ends here