===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-respawn-window.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/tmux/cmd-respawn-window.c	2015/10/31 08:13:58	1.25
--- src/usr.bin/tmux/cmd-respawn-window.c	2015/12/13 14:32:38	1.26
***************
*** 1,4 ****
! /* $OpenBSD: cmd-respawn-window.c,v 1.25 2015/10/31 08:13:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-respawn-window.c,v 1.26 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 33,39 ****
  	"respawn-window", "respawnw",
  	"kt:", 0, -1,
  	"[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
! 	0,
  	cmd_respawn_window_exec
  };
  
--- 33,39 ----
  	"respawn-window", "respawnw",
  	"kt:", 0, -1,
  	"[-k] " CMD_TARGET_WINDOW_USAGE " [command]",
! 	CMD_WINDOW_T,
  	cmd_respawn_window_exec
  };
  
***************
*** 41,65 ****
  cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
! 	struct winlink		*wl;
! 	struct window		*w;
  	struct window_pane	*wp;
- 	struct session		*s;
  	struct environ		*env;
  	const char		*path;
  	char		 	*cause;
  	struct environ_entry	*envent;
  
- 	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), &s)) == NULL)
- 		return (CMD_RETURN_ERROR);
- 	w = wl->window;
- 
  	if (!args_has(self->args, 'k')) {
  		TAILQ_FOREACH(wp, &w->panes, entry) {
  			if (wp->fd == -1)
  				continue;
! 			cmdq_error(cmdq,
! 			    "window still active: %s:%d", s->name, wl->idx);
  			return (CMD_RETURN_ERROR);
  		}
  	}
--- 41,61 ----
  cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
! 	struct session		*s = cmdq->state.tflag.s;
! 	struct winlink		*wl = cmdq->state.tflag.wl;
! 	struct window		*w = wl->window;
  	struct window_pane	*wp;
  	struct environ		*env;
  	const char		*path;
  	char		 	*cause;
  	struct environ_entry	*envent;
  
  	if (!args_has(self->args, 'k')) {
  		TAILQ_FOREACH(wp, &w->panes, entry) {
  			if (wp->fd == -1)
  				continue;
! 			cmdq_error(cmdq, "window still active: %s:%d", s->name,
! 			    wl->idx);
  			return (CMD_RETURN_ERROR);
  		}
  	}