summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-07-15 11:03:17 +0000
committernicm <nicm@openbsd.org>2020-07-15 11:03:17 +0000
commite8b59d3cf3bc30ef083bc4700d33f5b83c897007 (patch)
tree344b0481e63e29bd1830e865478fdf8739ac78ed
parentAdd a forward declaration of struct cpu_info. (diff)
downloadwireguard-openbsd-e8b59d3cf3bc30ef083bc4700d33f5b83c897007.tar.xz
wireguard-openbsd-e8b59d3cf3bc30ef083bc4700d33f5b83c897007.zip
Renumber after killing windows for choose-tree.
-rw-r--r--usr.bin/tmux/window-tree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/tmux/window-tree.c b/usr.bin/tmux/window-tree.c
index 74760314c6f..975514f9e5b 100644
--- a/usr.bin/tmux/window-tree.c
+++ b/usr.bin/tmux/window-tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-tree.c,v 1.51 2020/07/04 14:24:02 nicm Exp $ */
+/* $OpenBSD: window-tree.c,v 1.52 2020/07/15 11:03:17 nicm Exp $ */
/*
* Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1054,7 +1054,7 @@ window_tree_kill_each(__unused void *modedata, void *itemdata,
break;
case WINDOW_TREE_WINDOW:
if (wl != NULL)
- server_kill_window(wl->window, 1);
+ server_kill_window(wl->window, 0);
break;
case WINDOW_TREE_PANE:
if (wp != NULL)
@@ -1076,6 +1076,7 @@ window_tree_kill_current_callback(struct client *c, void *modedata,
return (0);
window_tree_kill_each(data, mode_tree_get_current(mtd), c, KEYC_NONE);
+ server_renumber_all();
data->references++;
cmdq_append(c, cmdq_get_callback(window_tree_command_done, data));
@@ -1096,6 +1097,7 @@ window_tree_kill_tagged_callback(struct client *c, void *modedata,
return (0);
mode_tree_each_tagged(mtd, window_tree_kill_each, c, KEYC_NONE, 1);
+ server_renumber_all();
data->references++;
cmdq_append(c, cmdq_get_callback(window_tree_command_done, data));