From a8ed6c9f7d83e168cca345a933dbf03ea566fdfd Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 17 Aug 2024 14:24:51 -0400 Subject: [PATCH] fix(vc-gutter): inhibit diff-hl-dired-mode in dirvish Ref: #6760 --- modules/ui/vc-gutter/config.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el index 688d803d0..342848be7 100644 --- a/modules/ui/vc-gutter/config.el +++ b/modules/ui/vc-gutter/config.el @@ -69,7 +69,8 @@ (defun +vc-gutter-enable-maybe-h () "Conditionally enable `diff-hl-dired-mode' in dired buffers. Respects `diff-hl-disable-on-remote'." - (unless (and (bound-and-true-p diff-hl-disable-on-remote) + (unless (and (bound-and-true-p dirvish-override-dired-mode) + (bound-and-true-p diff-hl-disable-on-remote) (file-remote-p default-directory)) (diff-hl-dired-mode +1))))