===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/tmux/cmd-find.c	2017/03/11 15:16:08	1.41
--- src/usr.bin/tmux/cmd-find.c	2017/03/13 10:53:32	1.42
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.41 2017/03/11 15:16:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.42 2017/03/13 10:53:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 483,490 ****
  	if (cmd_find_get_window_with_session(fs, window) == 0)
  		return (0);
  
! 	/* Try as a session if it looks like a session. */
! 	if (*window == '$' && cmd_find_get_session(fs, window) == 0) {
  		fs->wl = fs->s->curw;
  		fs->w = fs->wl->window;
  		if (~fs->flags & CMD_FIND_WINDOW_INDEX)
--- 483,490 ----
  	if (cmd_find_get_window_with_session(fs, window) == 0)
  		return (0);
  
! 	/* Otherwise try as a session itself. */
! 	if (cmd_find_get_session(fs, window) == 0) {
  		fs->wl = fs->s->curw;
  		fs->w = fs->wl->window;
  		if (~fs->flags & CMD_FIND_WINDOW_INDEX)
***************
*** 674,681 ****
  	if (cmd_find_get_pane_with_window(fs, pane) == 0)
  		return (0);
  
! 	/* Try as a window if it looks like a window. */
! 	if (*pane == '@' && cmd_find_get_window(fs, pane) == 0) {
  		fs->wp = fs->w->active;
  		return (0);
  	}
--- 674,681 ----
  	if (cmd_find_get_pane_with_window(fs, pane) == 0)
  		return (0);
  
! 	/* Otherwise try as a window itself (this will also try as session). */
! 	if (cmd_find_get_window(fs, pane) == 0) {
  		fs->wp = fs->w->active;
  		return (0);
  	}