===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/tmux/cmd-kill-window.c	2015/05/06 08:35:39	1.17
+++ src/usr.bin/tmux/cmd-kill-window.c	2015/12/13 14:32:38	1.18
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-kill-window.c,v 1.17 2015/05/06 08:35:39 nicm Exp $ */
+/* $OpenBSD: cmd-kill-window.c,v 1.18 2015/12/13 14:32:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,7 +30,7 @@
 	"kill-window", "killw",
 	"at:", 0, 0,
 	"[-a] " CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_kill_window_exec
 };
 
@@ -38,21 +38,17 @@
 	"unlink-window", "unlinkw",
 	"kt:", 0, 0,
 	"[-k] " CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_kill_window_exec
 };
 
 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;
+	struct args		*args = self->args;
+	struct winlink		*wl = cmdq->state.tflag.wl, *wl2, *wl3;
+	struct window		*w = wl->window;
+	struct session		*s = cmdq->state.tflag.s;
 
 	if (self->entry == &cmd_unlink_window_entry) {
 		if (!args_has(self->args, 'k') && !session_is_linked(s, w)) {