diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-git.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-git.el index 840a49b6..99e068ae 100644 --- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-git.el +++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-git.el @@ -37,15 +37,17 @@ (prot-emacs-configure (prot-emacs-install diff-hl) + (setq diff-hl-draw-borders nil) + (setq diff-hl-update-async t) + (prot-emacs-keybind global-map "C-x v " #'diff-hl-previous-hunk "C-x v " #'diff-hl-next-hunk) - (setq diff-hl-draw-borders nil) - (setq diff-hl-update-async t) + (prot-emacs-hook (prog-mode-hook vc-dir-mode-hook) turn-on-diff-hl-mode) - (add-hook 'prog-mode-hook 'turn-on-diff-hl-mode) - (add-hook 'vc-dir-mode-hook 'turn-on-diff-hl-mode)) + (with-eval-after-load 'magit + (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))) ;;;; `ediff' (prot-emacs-configure diff --git a/emacs/.emacs.d/prot-emacs.org b/emacs/.emacs.d/prot-emacs.org index c056e623..a78bf3de 100644 --- a/emacs/.emacs.d/prot-emacs.org +++ b/emacs/.emacs.d/prot-emacs.org @@ -7017,15 +7017,17 @@ sequence of function calls. (prot-emacs-configure (prot-emacs-install diff-hl) + (setq diff-hl-draw-borders nil) + (setq diff-hl-update-async t) + (prot-emacs-keybind global-map "C-x v " #'diff-hl-previous-hunk "C-x v " #'diff-hl-next-hunk) - (setq diff-hl-draw-borders nil) - (setq diff-hl-update-async t) + (prot-emacs-hook (prog-mode-hook vc-dir-mode-hook) turn-on-diff-hl-mode) - (add-hook 'prog-mode-hook 'turn-on-diff-hl-mode) - (add-hook 'vc-dir-mode-hook 'turn-on-diff-hl-mode)) + (with-eval-after-load 'magit + (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))) #+end_src *** The =prot-emacs-git.el= section about ediff