===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- src/usr.bin/tmux/cmd-find.c	2015/12/13 16:44:35	1.20
+++ src/usr.bin/tmux/cmd-find.c	2015/12/13 17:55:14	1.21
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-find.c,v 1.20 2015/12/13 16:44:35 nicm Exp $ */
+/* $OpenBSD: cmd-find.c,v 1.21 2015/12/13 17:55:14 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -467,11 +467,10 @@
 
 	/* Otherwise try as a session itself. */
 	if (cmd_find_get_session(fs, window) == 0) {
-		if (~fs->flags & CMD_FIND_WINDOW_INDEX) {
-			fs->wl = fs->s->curw;
-			fs->w = fs->wl->window;
+		fs->wl = fs->s->curw;
+		fs->w = fs->wl->window;
+		if (~fs->flags & CMD_FIND_WINDOW_INDEX)
 			fs->idx = fs->wl->idx;
-		}
 		return (0);
 	}
 
@@ -493,6 +492,13 @@
 	log_debug("%s: %s", __func__, window);
 	exact = (fs->flags & CMD_FIND_EXACT_WINDOW);
 
+	/*
+	 * Start with the current window as the default. So if only an index is
+	 * found, the window will be the current.
+	 */
+	fs->wl = fs->s->curw;
+	fs->w = fs->wl->window;
+
 	/* Check for window ids starting with @. */
 	if (*window == '@') {
 		fs->w = window_find_by_id_str(window);
@@ -976,8 +982,7 @@
 			/* This will fill in winlink and window. */
 			if (cmd_find_get_window_with_session(fs, window) != 0)
 				goto no_window;
-			if (~flags & CMD_FIND_WINDOW_INDEX)
-				fs->wp = fs->wl->window->active;
+			fs->wp = fs->wl->window->active;
 			goto found;
 		}
 
@@ -1017,8 +1022,7 @@
 		/* This will fill in session, winlink and window. */
 		if (cmd_find_get_window(fs, window) != 0)
 			goto no_window;
-		if (~flags & CMD_FIND_WINDOW_INDEX)
-			fs->wp = fs->wl->window->active;
+		fs->wp = fs->wl->window->active;
 		goto found;
 	}