mirror of
https://github.com/jimeh/.emacs.d.git
synced 2026-02-19 13:46:41 +00:00
Jim Myhrberg
5a425b5812
The very next commit introduces a new feature to show git hunks, which seems to have a negative impact on performance when moving the cursor around, or adding/removing text within lines which are highlighted by diff-hl while diff-hl-flydiff-mode is enabled. So for now I'm pinning diff-hl to the commit right before this was introduced.
82 lines
2.3 KiB
EmacsLisp
82 lines
2.3 KiB
EmacsLisp
;;; siren-diff-hl.el --- jimeh's Emacs Siren: diff-hl configuration.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Basic configuration for diff-hl.
|
|
|
|
;;; Code:
|
|
|
|
(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)
|
|
|
|
:custom
|
|
;; (diff-hl-fringe-bmp-function 'siren-diff-hl-fringe-bmp-line)
|
|
;; (diff-hl-fringe-face-function 'siren-diff-hl-fringe-face-from-type)
|
|
(diff-hl-fringe-bmp-function 'diff-hl-fringe-bmp-from-pos)
|
|
(diff-hl-fringe-face-function '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))
|
|
|
|
(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-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)
|
|
|
|
(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-line(type _pos)
|
|
'siren-diff-hl-insert)
|
|
|
|
: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
|
|
[224] nil nil '(center repeated))
|
|
(define-fringe-bitmap 'siren-diff-hl-change
|
|
[224] nil nil '(center repeated))
|
|
(define-fringe-bitmap 'siren-diff-hl-delete
|
|
[128 192 224 240] nil nil 'bottom)))
|
|
|
|
(provide 'siren-diff-hl)
|
|
;;; siren-diff-hl.el ends here
|