===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-window.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/cmd-kill-window.c	2017/04/22 10:22:39	1.24
--- src/usr.bin/tmux/cmd-kill-window.c	2020/04/13 08:26:27	1.25
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-window.c,v 1.24 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 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>
***************
*** 55,67 ****
  static enum cmd_retval
  cmd_kill_window_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = self->args;
  	struct winlink		*wl = item->target.wl, *wl2, *wl3;
  	struct window		*w = wl->window;
  	struct session		*s = item->target.s;
  
! 	if (self->entry == &cmd_unlink_window_entry) {
! 		if (!args_has(self->args, 'k') && !session_is_linked(s, w)) {
  			cmdq_error(item, "window only linked to one session");
  			return (CMD_RETURN_ERROR);
  		}
--- 55,67 ----
  static enum cmd_retval
  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)) {
  			cmdq_error(item, "window only linked to one session");
  			return (CMD_RETURN_ERROR);
  		}