===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-tree.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/tmux/window-tree.c	2020/07/04 14:24:02	1.51
--- src/usr.bin/tmux/window-tree.c	2020/07/15 11:03:17	1.52
***************
*** 1,4 ****
! /* $OpenBSD: window-tree.c,v 1.51 2020/07/04 14:24:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $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,1060 ****
  		break;
  	case WINDOW_TREE_WINDOW:
  		if (wl != NULL)
! 			server_kill_window(wl->window, 1);
  		break;
  	case WINDOW_TREE_PANE:
  		if (wp != NULL)
--- 1054,1060 ----
  		break;
  	case WINDOW_TREE_WINDOW:
  		if (wl != NULL)
! 			server_kill_window(wl->window, 0);
  		break;
  	case WINDOW_TREE_PANE:
  		if (wp != NULL)
***************
*** 1076,1081 ****
--- 1076,1082 ----
  		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,1101 ****
--- 1097,1103 ----
  		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));