From a6c3c6842a4cd282c2a23d3ff1bc3d6fd98cdb96 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 21 Aug 2024 02:11:55 -0400 Subject: [PATCH] refactor(dired): use dirvish-preview-environment - Remove +dired--suppress-hooks-in-previews-a, because Dirvish already does this. - Exploit dirvish-preview-environment instead of hardcoding the enable-local-variables let-binding for the child process. Its defaults are more reasonable. --- modules/emacs/dired/config.el | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el index 37cc5a292..5521bea09 100644 --- a/modules/emacs/dired/config.el +++ b/modules/emacs/dired/config.el @@ -199,18 +199,13 @@ Fixes #3939: unsortable dired entries on Windows." (if (and (file-directory-p (car args)) (eq (car-safe result) 'dired)) `(dired . (,@(butlast (cdr result)) - ,(format "(let ((enable-local-variables nil)) %s)" + ,(format "(let %s %s)" + (prin1-to-string + (mapcar (lambda (env) `(,(car env) ,(cdr env))) + (remove '(inhibit-message . t) dirvish-preview-environment))) (car (last (cdr result)))))) result))) - ;; HACK: Suppress mode hooks when previewing files, as they may contain - ;; expensive or disruptive functionality that isn't needed just for - ;; previewing them. - ;; REVIEW: Upstream this later? - (defadvice! +dired--suppress-hooks-in-previews-a (fn &rest args) - :around #'dirvish--find-file-temporarily - (delay-mode-hooks (apply fn args))) - ;; HACK: Dirvish will complain that pdf-tools is required to preview PDFs, ;; even if the package is installed, so I advise it to try autoloading it ;; before complaining, otherwise complain if epdfinfo hasn't been built yet.