emacs/dired: fix icons interfering w/ wdired #1929

This commit is contained in:
Henrik Lissner 2019-10-22 01:58:17 -04:00
parent e31f51e0ba
commit 0ccf31635d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -108,7 +108,23 @@ we have to clean it up ourselves."
(use-package! all-the-icons-dired (use-package! all-the-icons-dired
:when (featurep! +icons) :when (featurep! +icons)
:hook (dired-mode . all-the-icons-dired-mode)) :hook (dired-mode . all-the-icons-dired-mode)
:config
;; HACK Fixes #1929: icons break file renaming in Emacs 27+, because the icon
;; is considered part of the filename, so we disable icons while we're in
;; wdired-mode.
(when EMACS27+
(defvar-local +wdired-icons-enabled nil)
(defadvice! +dired-disable-icons-in-wdired-mode-a (&rest _)
:before #'+wdired-before-start-advice
(setq +wdired-icons-enabled (if all-the-icons-dired-mode 1 0))
(when all-the-icons-dired-mode
(all-the-icons-dired-mode -1)))
(defadvice! +dired-restore-icons-after-wdired-mode-a (&rest _)
:after #'+wdired-after-finish-advice
(all-the-icons-dired-mode +wdired-icons-enabled))))
(use-package! dired-x (use-package! dired-x