fix(undead-buffers): guard kill-other-window against a lone window

In a single-window frame cj/kill-other-window killed the buffer being viewed: other-window no-ops, delete-window was guarded, but the kill still ran on the current buffer. Signal a user-error instead, matching the sibling cj/kill-other-window-buffer. Past the guard there's always another window, so delete-window drops its own check.

The single-window test asserted the broken behavior, so I rewrote it to expect the user-error and an untouched buffer.

Also documented the prefix-argument undead-mark in cj/kill-buffer-or-bury-alive.

2 files changed, 15 insertions, 8 deletions

diff --git a/modules/undead-buffers.el b/modules/undead-buffers.el
index cbd2c0d7..21a04de9 100644
--- a/modules/undead-buffers.el
+++ b/modules/undead-buffers.el
@@ -65,7 +65,10 @@ regexp in `cj/undead-buffer-regexps'."
                      cj/undead-buffer-regexps))))
 
 (defun cj/kill-buffer-or-bury-alive (buffer)
-  "Kill BUFFER or bury it if it's in `cj/undead-buffer-list'."
+  "Kill BUFFER, or bury it when it is in `cj/undead-buffer-list'.
+With a prefix argument (e.g. \\`C-u'), instead add BUFFER's name to
+`cj/undead-buffer-list' and report it, so the buffer is buried rather than
+killed on later kill attempts."
   (interactive "bBuffer to kill or bury: ")
   (with-current-buffer buffer
 	(if current-prefix-arg
@@ -97,12 +100,15 @@ Undead-buffers are buffers in `cj/undead-buffer-list'."
 ;; Keybinding moved to custom-buffer-file.el (C-; b k)
 
 (defun cj/kill-other-window ()
-  "Delete the next window and kill or bury its buffer."
+  "Delete the next window and kill or bury its buffer.
+Signal a `user-error' in a single-window frame, where there is no other
+window and acting would kill the buffer being viewed."
   (interactive)
+  (when (one-window-p)
+	(user-error "No other window"))
   (other-window 1)
   (let ((buf (current-buffer)))
-	(unless (one-window-p)
-	  (delete-window))
+	(delete-window)
 	(cj/kill-buffer-or-bury-alive buf)))
 (keymap-global-set "M-S-o" #'cj/kill-other-window)
 
diff --git a/tests/test-undead-buffers-kill-other-window.el b/tests/test-undead-buffers-kill-other-window.el
index e9371a0f..000ada9b 100644
--- a/tests/test-undead-buffers-kill-other-window.el
+++ b/tests/test-undead-buffers-kill-other-window.el
@@ -66,8 +66,9 @@
 
 ;;; Boundary Cases
 
-(ert-deftest test-kill-other-window-single-window-should-only-kill-buffer ()
-  "With single window, should only kill the current buffer."
+(ert-deftest test-kill-other-window-single-window-signals-no-other-window ()
+  "Error: with a single window, signal `user-error' and kill nothing.
+There is no other window, so acting would kill the buffer being viewed."
   (test-kill-other-window-setup)
   (unwind-protect
       (let ((buf (generate-new-buffer "*test-single-other*")))
@@ -75,9 +76,9 @@
             (progn
               (switch-to-buffer buf)
               (should (one-window-p))
-              (cj/kill-other-window)
+              (should-error (cj/kill-other-window) :type 'user-error)
               (should (one-window-p))
-              (should-not (buffer-live-p buf)))
+              (should (buffer-live-p buf)))
           (when (buffer-live-p buf) (kill-buffer buf))))
     (test-kill-other-window-teardown)))