aboutsummaryrefslogtreecommitdiff
path: root/modules/dirvish-config.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-05-10 13:41:27 -0500
committerCraig Jennings <c@cjennings.net>2026-05-10 13:41:27 -0500
commit09f3349af22c932a01f0788787cee9ab4f3c38a7 (patch)
treed55cef5a67ff52051145177fd25f6a7faeafb096 /modules/dirvish-config.el
parent3c840b0569ba3461cd61eabc32919f6899a25163 (diff)
downloaddotemacs-09f3349af22c932a01f0788787cee9ab4f3c38a7.tar.gz
dotemacs-09f3349af22c932a01f0788787cee9ab4f3c38a7.zip
refactor(dirvish): extract cj/--ediff-pair-from-files; fix 0-files crash
`cj/dired-ediff-files' had its pair-determination logic inline: count check, prompt fallback when only one file was marked, and the older-first ordering for `ediff-files'. Lift it into `cj/--ediff-pair-from-files' -- pure given the file list, an injected prompt thunk, and a newer-than-p comparator -- so tests stay independent of mtimes and the dired prompt. While extracting, surface a latent bug: with zero marked files the original code fell through to `(file-newer-than-file-p nil nil)' and crashed with a wrong-type-argument error. Replace the crash with a clear `user-error' ("No files marked"), and add a regression test. The 3+ files case keeps its existing user-error message. Five Normal/Boundary/Error tests cover both ordering directions, the one-file prompt path, and both error counts.
Diffstat (limited to 'modules/dirvish-config.el')
-rw-r--r--modules/dirvish-config.el53
1 files changed, 36 insertions, 17 deletions
diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el
index 438d21fa..86ecfd2d 100644
--- a/modules/dirvish-config.el
+++ b/modules/dirvish-config.el
@@ -32,26 +32,45 @@
;;; ----------------------------- Dired Ediff Files -----------------------------
+(defun cj/--ediff-pair-from-files (files prompt-fn newer-than-p)
+ "Return a (OLDER . NEWER) cons for ediff'ing FILES.
+
+FILES is the list of marked file paths. PROMPT-FN is a thunk used to
+acquire a second file when only one is marked. NEWER-THAN-P is a binary
+predicate (a b) -> non-nil when A is newer than B.
+
+Signals `user-error' for zero or 3+ files; the latter matches the original
+contract, the former replaces a latent crash where the caller fell through
+to (file-newer-than-file-p nil ...).
+
+Pure helper used by `cj/dired-ediff-files'."
+ (let ((n (length files)))
+ (cond
+ ((zerop n)
+ (user-error "No files marked"))
+ ((> n 2)
+ (user-error "No more than 2 files should be marked"))
+ (t
+ (let ((file1 (car files))
+ (file2 (or (cadr files) (funcall prompt-fn))))
+ (if (funcall newer-than-p file1 file2)
+ (cons file2 file1)
+ (cons file1 file2)))))))
+
(defun cj/dired-ediff-files ()
"Ediff two selected files within Dired."
(interactive)
- (let ((files (dired-get-marked-files))
- (wnd (current-window-configuration)))
- (if (<= (length files) 2)
- (let ((file1 (car files))
- (file2 (if (cdr files)
- (cadr files)
- (read-file-name
- "file: "
- (dired-dwim-target-directory)))))
- (if (file-newer-than-file-p file1 file2)
- (ediff-files file2 file1)
- (ediff-files file1 file2))
- (add-hook 'ediff-after-quit-hook-internal
- (lambda ()
- (setq ediff-after-quit-hook-internal nil)
- (set-window-configuration wnd))))
- (error "No more than 2 files should be marked"))))
+ (let* ((wnd (current-window-configuration))
+ (pair (cj/--ediff-pair-from-files
+ (dired-get-marked-files)
+ (lambda ()
+ (read-file-name "file: " (dired-dwim-target-directory)))
+ #'file-newer-than-file-p)))
+ (ediff-files (car pair) (cdr pair))
+ (add-hook 'ediff-after-quit-hook-internal
+ (lambda ()
+ (setq ediff-after-quit-hook-internal nil)
+ (set-window-configuration wnd)))))
;; ------------------------ Create Playlist From Marked ------------------------