===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-layout.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/usr.bin/tmux/cmd-select-layout.c	2015/04/28 10:43:13	1.25
+++ src/usr.bin/tmux/cmd-select-layout.c	2015/12/13 14:32:38	1.26
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-select-layout.c,v 1.25 2015/04/28 10:43:13 nicm Exp $ */
+/* $OpenBSD: cmd-select-layout.c,v 1.26 2015/12/13 14:32:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@
 	"select-layout", "selectl",
 	"nopt:", 0, 1,
 	"[-nop] " CMD_TARGET_WINDOW_USAGE " [layout-name]",
-	0,
+	CMD_WINDOW_T,
 	cmd_select_layout_exec
 };
 
@@ -40,7 +40,7 @@
 	"next-layout", "nextl",
 	"t:", 0, 0,
 	CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_layout_exec
 };
 
@@ -48,7 +48,7 @@
 	"previous-layout", "prevl",
 	"t:", 0, 0,
 	CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_layout_exec
 };
 
@@ -56,16 +56,13 @@
 cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
-	struct winlink	*wl;
+	struct winlink	*wl = cmdq->state.tflag.wl;
 	struct window	*w;
 	const char	*layoutname;
 	char		*oldlayout;
 	int		 next, previous, layout;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
 	w = wl->window;
-
 	server_unzoom_window(w);
 
 	next = self->entry == &cmd_next_layout_entry;