===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-window.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tmux/cmd-kill-window.c	2014/10/22 23:11:41	1.16
--- src/usr.bin/tmux/cmd-kill-window.c	2015/05/06 08:35:39	1.17
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-window.c,v 1.16 2014/10/22 23:11:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-window.c,v 1.17 2015/05/06 08:35:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 45,68 ****
  enum cmd_retval
  cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
! 	struct args		*args = self->args;
! 	struct winlink		*wl, *wl2, *wl3;
! 	struct window		*w;
! 	struct session		*s;
! 	struct session_group	*sg;
! 	u_int			 references;
  
  	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
  		return (CMD_RETURN_ERROR);
  	w = wl->window;
  
  	if (self->entry == &cmd_unlink_window_entry) {
! 		sg = session_group_find(s);
! 		if (sg != NULL)
! 			references = session_group_count(sg);
! 		else
! 			references = 1;
! 		if (!args_has(self->args, 'k') && w->references == references) {
  			cmdq_error(cmdq, "window only linked to one session");
  			return (CMD_RETURN_ERROR);
  		}
--- 45,61 ----
  enum cmd_retval
  cmd_kill_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
! 	struct args	*args = self->args;
! 	struct winlink	*wl, *wl2, *wl3;
! 	struct window	*w;
! 	struct session	*s;
  
  	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
  		return (CMD_RETURN_ERROR);
  	w = wl->window;
  
  	if (self->entry == &cmd_unlink_window_entry) {
! 		if (!args_has(self->args, 'k') && !session_is_linked(s, w)) {
  			cmdq_error(cmdq, "window only linked to one session");
  			return (CMD_RETURN_ERROR);
  		}