===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-window.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/tmux/cmd-kill-window.c	2020/04/13 08:26:27	1.25
--- src/usr.bin/tmux/cmd-kill-window.c	2020/04/13 10:59:58	1.26
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-window.c,v 1.25 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-window.c,v 1.26 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 56,64 ****
  cmd_kill_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
! 	struct winlink		*wl = item->target.wl, *wl2, *wl3;
  	struct window		*w = wl->window;
! 	struct session		*s = item->target.s;
  
  	if (cmd_get_entry(self) == &cmd_unlink_window_entry) {
  		if (!args_has(args, 'k') && !session_is_linked(s, w)) {
--- 56,65 ----
  cmd_kill_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
! 	struct cmd_find_state	*target = cmdq_get_target(item);
! 	struct winlink		*wl = target->wl, *wl2, *wl3;
  	struct window		*w = wl->window;
! 	struct session		*s = target->s;
  
  	if (cmd_get_entry(self) == &cmd_unlink_window_entry) {
  		if (!args_has(args, 'k') && !session_is_linked(s, w)) {