refactor!(dired): move diff-hl config to :ui vc-gutter
BREAKING CHANGE: users who are used to diff-hl displaying diffs in dired will notice they have vanished. diff-hl's conig has been moved to :ui vc-gutter +diff-hl (added in27a448b
). Enable it to get it back. Ref:27a448b04b
This commit is contained in:
parent
e76f327e0a
commit
24623f9959
3 changed files with 1 additions and 10 deletions
|
@ -71,15 +71,6 @@ Fixes #3939: unsortable dired entries on Windows."
|
||||||
:hook (dired-mode . diredfl-mode))
|
: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
|
(use-package! ranger
|
||||||
:when (featurep! +ranger)
|
:when (featurep! +ranger)
|
||||||
:after dired
|
:after dired
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
(package! diredfl :pin "f9140b2c42151dca669003d685c9f079b2e3dc37")
|
(package! diredfl :pin "f9140b2c42151dca669003d685c9f079b2e3dc37")
|
||||||
(package! dired-git-info :pin "9461476a28a5fec0784260f6e318237c662c3430")
|
(package! dired-git-info :pin "9461476a28a5fec0784260f6e318237c662c3430")
|
||||||
(package! diff-hl :pin "4a08b02afec1fc6b1e84de46cc34f75f6c9c3bcc")
|
|
||||||
(package! dired-rsync :pin "7940d9154d0a908693999b0e1ea351a6d365c93d")
|
(package! dired-rsync :pin "7940d9154d0a908693999b0e1ea351a6d365c93d")
|
||||||
(when (featurep! +ranger)
|
(when (featurep! +ranger)
|
||||||
(package! ranger :pin "2498519cb21dcd5791d240607a72a204d1761668"))
|
(package! ranger :pin "2498519cb21dcd5791d240607a72a204d1761668"))
|
||||||
|
|
|
@ -149,6 +149,7 @@ is deferred until the file is saved. Respects `git-gutter:disabled-modes'."
|
||||||
:when (featurep! +diff-hl)
|
:when (featurep! +diff-hl)
|
||||||
:hook (find-file . diff-hl-mode)
|
:hook (find-file . diff-hl-mode)
|
||||||
:hook (vc-dir-mode . diff-hl-dir-mode)
|
:hook (vc-dir-mode . diff-hl-dir-mode)
|
||||||
|
:hook (dired-mode . diff-hl-dired-mode)
|
||||||
:hook (diff-hl-mode . diff-hl-flydiff-mode)
|
:hook (diff-hl-mode . diff-hl-flydiff-mode)
|
||||||
:config
|
:config
|
||||||
(set-popup-rule! "^\\*diff-hl" :select nil :size '+popup-shrink-to-fit)
|
(set-popup-rule! "^\\*diff-hl" :select nil :size '+popup-shrink-to-fit)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue