From 7c5d8641a141777dd48ba52bc1406a534959c724 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 25 Jul 2024 19:41:51 -0400 Subject: [PATCH] fix(vc-gutter): respect diff-hl-disable-on-remote in dired Neither `diff-hl-dired-mode` or `diff-hl-dired-mode-unless-remote` respect diff-hl-disable-on-remote, so added my own enabler hook. --- modules/ui/vc-gutter/config.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el index 2be8761c5..4dcc1f2a3 100644 --- a/modules/ui/vc-gutter/config.el +++ b/modules/ui/vc-gutter/config.el @@ -60,11 +60,19 @@ ;;; diff-hl (use-package! diff-hl - :hook (dired-mode . diff-hl-dired-mode) :hook (doom-first-file . global-diff-hl-mode) :hook (vc-dir-mode . turn-on-diff-hl-mode) :hook (diff-hl-mode . diff-hl-flydiff-mode) :commands diff-hl-stage-current-hunk diff-hl-revert-hunk diff-hl-next-hunk diff-hl-previous-hunk + :init + (add-hook! 'dired-mode-hook + (defun +vc-gutter-enable-maybe-h () + "Conditionally enable `diff-hl-dired-mode' in dired buffers. +Respects `diff-hl-disable-on-remote'." + (unless (and diff-hl-disable-on-remote + (file-remote-p default-directory)) + (diff-hl-dired-mode +1)))) + :config (set-popup-rule! "^\\*diff-hl" :select nil :size '+popup-shrink-to-fit)