Merge branch 'obsd-master'

1 files changed, 6 insertions, 15 deletions

diff --git a/cmd-select-window.c b/cmd-select-window.c
index f530f1fe..ede60dae 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_select_window_entry = {
 	"select-window", "selectw",
 	"lnpTt:", 0, 0,
 	"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_window_exec
 };
 
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_next_window_entry = {
 	"next-window", "next",
 	"at:", 0, 0,
 	"[-a] " CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_select_window_exec
 };
 
@@ -48,7 +48,7 @@ const struct cmd_entry cmd_previous_window_entry = {
 	"previous-window", "prev",
 	"at:", 0, 0,
 	"[-a] " CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_select_window_exec
 };
 
@@ -56,16 +56,15 @@ const struct cmd_entry cmd_last_window_entry = {
 	"last-window", "last",
 	"t:", 0, 0,
 	CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_select_window_exec
 };
 
 enum cmd_retval
 cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {
-	struct args	*args = self->args;
-	struct winlink	*wl;
-	struct session	*s;
+	struct winlink	*wl = cmdq->state.tflag.wl;
+	struct session	*s = cmdq->state.tflag.s;
 	int		 next, previous, last, activity;
 
 	next = self->entry == &cmd_next_window_entry;
@@ -79,10 +78,6 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		last = 1;
 
 	if (next || previous || last) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-
 		activity = args_has(self->args, 'a');
 		if (next) {
 			if (session_next(s, activity) != 0) {
@@ -103,10 +98,6 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 
 		server_redraw_session(s);
 	} else {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-
 		/*
 		 * If -T and select-window is invoked on same window as
 		 * current, switch to previous window.