From c6975b3bb46c35f8b41d934fd622033aa79a828c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 10 Apr 2018 10:48:44 +0000
Subject: Add x and X to choose-tree (with a confirmation prompt) to kill an
 item. Suggested by Matt Zagrabelny.

---
 cmd-kill-pane.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'cmd-kill-pane.c')

diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index a8a423d0..01b1f518 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -47,9 +47,8 @@ cmd_kill_pane_exec(struct cmd *self, struct cmdq_item *item)
 	struct winlink		*wl = item->target.wl;
 	struct window_pane	*loopwp, *tmpwp, *wp = item->target.wp;
 
-	server_unzoom_window(wl->window);
-
 	if (args_has(self->args, 'a')) {
+		server_unzoom_window(wl->window);
 		TAILQ_FOREACH_SAFE(loopwp, &wl->window->panes, entry, tmpwp) {
 			if (loopwp == wp)
 				continue;
@@ -60,13 +59,6 @@ cmd_kill_pane_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if (window_count_panes(wl->window) == 1) {
-		server_kill_window(wl->window);
-		recalculate_sizes();
-	} else {
-		layout_close_pane(wp);
-		window_remove_pane(wl->window, wp);
-		server_redraw_window(wl->window);
-	}
+	server_kill_pane(wp);
 	return (CMD_RETURN_NORMAL);
 }
-- 
cgit v1.2.3