diff options
| author | Craig Jennings <c@cjennings.net> | 2026-06-30 15:42:56 -0400 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-06-30 15:42:56 -0400 |
| commit | 3cb2790a391e708e9db63dbcd469cfa10afce98e (patch) | |
| tree | 674f0a57494b482be6c754b60981985835267b75 /modules | |
| parent | 582ed54ed9a3c600e7e1e68beeea8b16ce1ed613 (diff) | |
| download | dotemacs-3cb2790a391e708e9db63dbcd469cfa10afce98e.tar.gz dotemacs-3cb2790a391e708e9db63dbcd469cfa10afce98e.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 'modules')
| -rw-r--r-- | modules/undead-buffers.el | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/undead-buffers.el b/modules/undead-buffers.el index 4780ef227..cbd2c0d7e 100644 --- a/modules/undead-buffers.el +++ b/modules/undead-buffers.el @@ -87,12 +87,6 @@ Undead-buffers are buffers in `cj/undead-buffer-list'." (buffer-file-name buf) (buffer-modified-p buf)))) -(defun cj/save-some-buffers (&optional arg) - "Save some buffers, omitting those in `cj/undead-buffer-list'. -ARG is passed to `save-some-buffers'." - (interactive "P") - (save-some-buffers arg #'cj/undead-buffer-p)) - (defun cj/kill-buffer-and-window () "Delete window and kill or bury its buffer." (interactive) @@ -129,7 +123,7 @@ split is preserved. Buffers in `cj/undead-buffer-list' are buried." (defun cj/kill-all-other-buffers-and-windows () "Kill or bury all other buffers, then delete other windows." (interactive) - (cj/save-some-buffers) + (save-some-buffers nil #'cj/undead-buffer-p) (delete-other-windows) (mapc #'cj/kill-buffer-or-bury-alive (delq (current-buffer) (buffer-list)))) |