aboutsummaryrefslogtreecommitdiff
path: root/tests/test-undead-buffers-kill-all-other-buffers-and-windows.el
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-06-30 15:42:56 -0400
committerCraig Jennings <c@cjennings.net>2026-06-30 15:42:56 -0400
commit72b149227dcb44cc44a232138289bd6d7f7e3309 (patch)
treea1a1e32ec3c0087df0c22024c99a5fe97e02a3a6 /tests/test-undead-buffers-kill-all-other-buffers-and-windows.el
parentd5e9451022e9254655cc67e015f9d331414d2d76 (diff)
downloaddotemacs-72b149227dcb44cc44a232138289bd6d7f7e3309.tar.gz
dotemacs-72b149227dcb44cc44a232138289bd6d7f7e3309.zip
fix(undead-buffers): drop cj/save-some-buffers name collision
Emacs crashed at launch with wrong-number-of-arguments on cj/save-some-buffers, down the startup path (dashboard-only to kill-all-other-buffers to save). Two modules defined a function by that name: custom-buffer-file.el's legible save prompt (arg + pred), installed as an override on save-some-buffers, and undead-buffers.el's older one-arg wrapper that called save-some-buffers internally. custom-buffer-file loads first, undead-buffers second. The one-arg version won the shared symbol, so the override re-entered it with two args. I removed undead-buffers.el's wrapper. cj/kill-all-other-buffers-and-windows now calls the standard save-some-buffers with the undead predicate, which routes through the override when loaded and the built-in otherwise, so undead-buffers no longer depends on custom-buffer-file. The legible override keeps the cj/save-some-buffers name. A regression test loads both modules in launch order and guards the call and the arity so a one-arg shadow can't return.
Diffstat (limited to 'tests/test-undead-buffers-kill-all-other-buffers-and-windows.el')
-rw-r--r--tests/test-undead-buffers-kill-all-other-buffers-and-windows.el17
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/test-undead-buffers-kill-all-other-buffers-and-windows.el b/tests/test-undead-buffers-kill-all-other-buffers-and-windows.el
index dcd08e96..36d82add 100644
--- a/tests/test-undead-buffers-kill-all-other-buffers-and-windows.el
+++ b/tests/test-undead-buffers-kill-all-other-buffers-and-windows.el
@@ -133,23 +133,26 @@
(test-kill-all-other-buffers-and-windows-teardown)))
(ert-deftest test-kill-all-other-buffers-and-windows-should-prompt-for-modified-buffers ()
- "Should call cj/save-some-buffers to handle modified buffers."
+ "Should call save-some-buffers with the undead predicate to handle modified buffers."
(test-kill-all-other-buffers-and-windows-setup)
(unwind-protect
(let ((main (current-buffer))
(file (cj/create-temp-test-file-with-content "original"))
- save-called)
- ;; Mock cj/save-some-buffers to track if it's called
- (cl-letf (((symbol-function 'cj/save-some-buffers)
- (lambda (&optional arg)
- (setq save-called t))))
+ save-called save-pred)
+ ;; Mock save-some-buffers (the standard API the override hooks) to track
+ ;; the call and the predicate passed.
+ (cl-letf (((symbol-function 'save-some-buffers)
+ (lambda (&optional _arg pred &rest _)
+ (setq save-called t
+ save-pred pred))))
(let ((buf (find-file-noselect file)))
(unwind-protect
(progn
(with-current-buffer buf
(insert "modified"))
(cj/kill-all-other-buffers-and-windows)
- (should save-called))
+ (should save-called)
+ (should (eq save-pred #'cj/undead-buffer-p)))
(when (buffer-live-p buf)
(set-buffer-modified-p nil)
(kill-buffer buf))))))