diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el index 66d8aac73..4b0c48eaa 100644 --- a/modules/emacs/dired/config.el +++ b/modules/emacs/dired/config.el @@ -71,15 +71,6 @@ Fixes #3939: unsortable dired entries on Windows." :hook (dired-mode . diredfl-mode)) -(use-package! diff-hl - :when (featurep! :ui vc-gutter) - :hook (dired-mode-hook . diff-hl-margin-local-mode) - :init - (unless (featurep! :ui vc-gutter +diff-hl) - (add-hook 'dired-mode-hook #'diff-hl-dired-mode-unless-remote) - (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh))) - - (use-package! ranger :when (featurep! +ranger) :after dired diff --git a/modules/emacs/dired/packages.el b/modules/emacs/dired/packages.el index 96dc117e6..c98fd2b83 100644 --- a/modules/emacs/dired/packages.el +++ b/modules/emacs/dired/packages.el @@ -3,7 +3,6 @@ (package! diredfl :pin "f9140b2c42151dca669003d685c9f079b2e3dc37") (package! dired-git-info :pin "9461476a28a5fec0784260f6e318237c662c3430") -(package! diff-hl :pin "4a08b02afec1fc6b1e84de46cc34f75f6c9c3bcc") (package! dired-rsync :pin "7940d9154d0a908693999b0e1ea351a6d365c93d") (when (featurep! +ranger) (package! ranger :pin "2498519cb21dcd5791d240607a72a204d1761668")) diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el index 988355573..953a5075c 100644 --- a/modules/ui/vc-gutter/config.el +++ b/modules/ui/vc-gutter/config.el @@ -149,6 +149,7 @@ is deferred until the file is saved. Respects `git-gutter:disabled-modes'." :when (featurep! +diff-hl) :hook (find-file . diff-hl-mode) :hook (vc-dir-mode . diff-hl-dir-mode) + :hook (dired-mode . diff-hl-dired-mode) :hook (diff-hl-mode . diff-hl-flydiff-mode) :config (set-popup-rule! "^\\*diff-hl" :select nil :size '+popup-shrink-to-fit)