From 8f479aeb054477824f59fecb0b948b4b92d656ac Mon Sep 17 00:00:00 2001 From: Lin Sun Date: Wed, 9 Aug 2023 01:00:12 +0000 Subject: [PATCH 1/2] * layers/+spacemacs/spacemacs-editing/packages.el: Remove workaround for dired-quick-sort --- .../+spacemacs/spacemacs-editing/packages.el | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/layers/+spacemacs/spacemacs-editing/packages.el b/layers/+spacemacs/spacemacs-editing/packages.el index 6e29b46b469d..f58b35109a4c 100644 --- a/layers/+spacemacs/spacemacs-editing/packages.el +++ b/layers/+spacemacs/spacemacs-editing/packages.el @@ -111,21 +111,12 @@ (use-package dired-quick-sort :defer t :init - (spacemacs|add-transient-hook dired-mode-hook - (lambda () - (let ((dired-quick-sort-suppress-setup-warning 'message)) - (dired-quick-sort-setup)))) + (define-advice dired-noselect (:before (&rest _) quick-sort-setup) + (let ((dired-quick-sort-suppress-setup-warning 'message)) + (dired-quick-sort-setup)) + (advice-remove 'dired-noselect 'quick-sort-setup@dired-noselect)) :config - (evil-define-key 'normal dired-mode-map "s" 'hydra-dired-quick-sort/body) - ;; workaround for https://gitlab.com/xuhdev/dired-quick-sort/-/issues/14 - (define-advice dired-sort-toggle (:before ()) - "Recover `dired-actual-switches' with `dired-listing-switches' when long - option \"--sort=...\" exists, and convert \"--sort=time\" to \"-t\"." - (when (string-match-p "--sort=" dired-actual-switches) - (setq dired-actual-switches - (concat dired-listing-switches - (when (string-match-p "--sort=time" dired-actual-switches) - " -t"))))))) + (evil-define-key 'normal dired-mode-map "s" 'hydra-dired-quick-sort/body))) (defun spacemacs-editing/init-drag-stuff () (use-package drag-stuff From 8a28fde9ce83204aea095972ae0fab4abe797787 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Sat, 8 Feb 2025 15:37:05 -0500 Subject: [PATCH 2/2] Fix argument to advice-remove --- layers/+spacemacs/spacemacs-editing/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/+spacemacs/spacemacs-editing/packages.el b/layers/+spacemacs/spacemacs-editing/packages.el index f58b35109a4c..bf1c5de44fbc 100644 --- a/layers/+spacemacs/spacemacs-editing/packages.el +++ b/layers/+spacemacs/spacemacs-editing/packages.el @@ -114,7 +114,7 @@ (define-advice dired-noselect (:before (&rest _) quick-sort-setup) (let ((dired-quick-sort-suppress-setup-warning 'message)) (dired-quick-sort-setup)) - (advice-remove 'dired-noselect 'quick-sort-setup@dired-noselect)) + (advice-remove 'dired-noselect 'dired-noselect@quick-sort-setup)) :config (evil-define-key 'normal dired-mode-map "s" 'hydra-dired-quick-sort/body)))