From d6a2e24a3ec37bf9819460b3d9c3d21b85c63b84 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 29 Aug 2024 01:12:29 -0400 Subject: [PATCH] fix(dired,vc-gutter): don't inhibit diff-hl-dired-mode Dirvish uses the fringe for its vc-state diff, which isn't available in TTY Emacs, so we still need `diff-hl-dired-mode` there. Revert: a8ed6c9f7d83 Ref: #6760 --- modules/ui/vc-gutter/config.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el index 4225dfa2d..e3c061a55 100644 --- a/modules/ui/vc-gutter/config.el +++ b/modules/ui/vc-gutter/config.el @@ -69,8 +69,9 @@ (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 dirvish-override-dired-mode) - (bound-and-true-p diff-hl-disable-on-remote) + ;; Neither `diff-hl-dired-mode' or `diff-hl-dired-mode-unless-remote' + ;; respect `diff-hl-disable-on-remote', so... + (unless (and (bound-and-true-p diff-hl-disable-on-remote) (file-remote-p default-directory)) (diff-hl-dired-mode +1))))