emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(dired,vc-gutter): don't inhibit diff-hl-dired-mode

Browse source 
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: a8ed6c9f7d
Ref: #6760
This commit is contained in:
Henrik Lissner 2024-08-29 01:12:29 -04:00
parent 786dae5a5d
commit d6a2e24a3e
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/ui/vc-gutter/config.el
View file

@ -69,8 +69,9 @@
(defun +vc-gutter-enable-maybe-h () (defun +vc-gutter-enable-maybe-h ()
"Conditionally enable `diff-hl-dired-mode' in dired buffers. "Conditionally enable `diff-hl-dired-mode' in dired buffers.
Respects `diff-hl-disable-on-remote'." Respects `diff-hl-disable-on-remote'."
(unless (and (bound-and-true-p dirvish-override-dired-mode) ;; Neither `diff-hl-dired-mode' or `diff-hl-dired-mode-unless-remote'
(bound-and-true-p diff-hl-disable-on-remote) ;; respect `diff-hl-disable-on-remote', so...
(unless (and (bound-and-true-p diff-hl-disable-on-remote)
(file-remote-p default-directory)) (file-remote-p default-directory))
(diff-hl-dired-mode +1)))) (diff-hl-dired-mode +1))))