1 files changed, 21 insertions, 9 deletions

diff --git a/modules/undead-buffers.el b/modules/undead-buffers.el
index cbd2c0d7..e5b8dc00 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
@@ -93,17 +96,24 @@ Undead-buffers are buffers in `cj/undead-buffer-list'."
   (let ((buf (current-buffer)))
 	(unless (one-window-p)
 	  (delete-window))
-	(cj/kill-buffer-or-bury-alive buf)))
+	;; The delegate reads current-prefix-arg; a C-u meant for this wrapper
+	;; must not flip it into add-to-undead-list mode.
+	(let ((current-prefix-arg nil))
+	  (cj/kill-buffer-or-bury-alive buf))))
 ;; 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))
-	(cj/kill-buffer-or-bury-alive buf)))
+	(delete-window)
+	(let ((current-prefix-arg nil))
+	  (cj/kill-buffer-or-bury-alive buf))))
 (keymap-global-set "M-S-o" #'cj/kill-other-window)
 
 (defun cj/kill-other-window-buffer ()
@@ -117,7 +127,8 @@ split is preserved.  Buffers in `cj/undead-buffer-list' are buried."
   (if (one-window-p)
 	  (user-error "No other window")
 	(with-selected-window (next-window)
-	  (cj/kill-buffer-or-bury-alive (current-buffer)))))
+	  (let ((current-prefix-arg nil))
+		(cj/kill-buffer-or-bury-alive (current-buffer))))))
 ;; Keybinding in custom-buffer-file.el (C-; b K)
 
 (defun cj/kill-all-other-buffers-and-windows ()
@@ -125,8 +136,9 @@ split is preserved.  Buffers in `cj/undead-buffer-list' are buried."
   (interactive)
   (save-some-buffers nil #'cj/undead-buffer-p)
   (delete-other-windows)
-  (mapc #'cj/kill-buffer-or-bury-alive
-		(delq (current-buffer) (buffer-list))))
+  (let ((current-prefix-arg nil))
+	(mapc #'cj/kill-buffer-or-bury-alive
+		  (delq (current-buffer) (buffer-list)))))
 (keymap-global-set "M-S-m" #'cj/kill-all-other-buffers-and-windows)  ;; was M-M
 
 (provide 'undead-buffers)