feat(dirvish): make dired d=diff and D=delete to match the convention

dired's d was dired-flag-file-deletion and D was dired-do-delete, while the ediff diff sat on e. Bind d to the ediff diff and keep D as delete, so the d=diff / D=delete pair is consistent with C-; b and ibuffer. d no longer flags for deletion -- mark with m for batch deletes, then D. Fix the stale commentary (it called d "delete" and D "duplicate") and add which-key labels for the pair.

2 files changed, 35 insertions, 3 deletions

diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el
index 81d352dbd..b82cdd0d7 100644
--- a/modules/dirvish-config.el
+++ b/modules/dirvish-config.el
@@ -17,8 +17,8 @@
 ;; ediff, playlist creation, path copying, and external file manager integration.
 ;;
 ;; Key Bindings:
-;; - d: Delete marked files (dired-do-delete)
-;; - D: Duplicate file at point (adds "-copy" before extension)
+;; - d: Diff/ediff selected files (cj/dired-ediff-files)
+;; - D: Delete (dired-do-delete; mark with m for batches)
 ;; - g: Quick access menu (jump to predefined directories)
 ;; - G: Search with deadgrep in current directory
 ;; - f: Open system file manager in current directory
@@ -194,7 +194,9 @@ Filters for audio files, prompts for the playlist name, and saves the resulting
   (:map dired-mode-map
         ([remap dired-summary] . which-key-show-major-mode)
         ("E" . wdired-change-to-wdired-mode) ;; edit names and properties in buffer
-        ("e" . cj/dired-ediff-files))        ;; ediff files
+        ("e" . cj/dired-ediff-files)         ;; ediff files
+        ("d" . cj/dired-ediff-files)         ;; d = diff, matching C-; b / ibuffer (was dired-flag-file-deletion)
+        ("D" . dired-do-delete))             ;; D = delete (d no longer flags; mark with m, then D)
   :custom
   (dired-use-ls-dired nil)                             ;; non GNU FreeBSD doesn't support a "--dired" switch
   :config
@@ -205,6 +207,13 @@ Filters for audio files, prompts for the playlist name, and saves the resulting
   (setq dired-recursive-copies (quote always))         ;; "always" means no asking
   (setq dired-recursive-deletes (quote top)))          ;; "top" means ask once
 
+;; which-key labels for the d=diff / D=delete pair (shown in the major-mode
+;; popup via `which-key-show-major-mode').
+(with-eval-after-load 'which-key
+  (which-key-add-major-mode-key-based-replacements 'dired-mode
+    "d" "diff (ediff files)"
+    "D" "delete file"))
+
 ;; note: disabled as it prevents marking and moving files to another directory
 ;; (setq dired-kill-when-opening-new-dired-buffer t)   ;; don't litter by leaving buffers when navigating directories
 
diff --git a/tests/test-dirvish-config--dired-keys.el b/tests/test-dirvish-config--dired-keys.el
new file mode 100644
index 000000000..2df0e8db6
--- /dev/null
+++ b/tests/test-dirvish-config--dired-keys.el
@@ -0,0 +1,23 @@
+;;; test-dirvish-config--dired-keys.el --- dired d=diff / D=delete bindings -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; Regression: d and D in dired (and dirvish, which uses dired-mode-map) are the
+;; diff and delete pair, matching the convention under C-; b and in ibuffer.  A
+;; mismatch -- or a swapped which-key label -- once led to deleting a file while
+;; trying to diff it.
+
+;;; Code:
+
+(require 'ert)
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'dired)
+(require 'dirvish-config)
+
+(ert-deftest test-dirvish-dired-d-diffs-D-deletes ()
+  "Normal: dired d runs the ediff diff and D deletes, matching the d=diff /
+D=delete convention used under C-; b and in ibuffer."
+  (should (eq (keymap-lookup dired-mode-map "d") #'cj/dired-ediff-files))
+  (should (eq (keymap-lookup dired-mode-map "D") #'dired-do-delete)))
+
+(provide 'test-dirvish-config--dired-keys)
+;;; test-dirvish-config--dired-keys.el ends here