===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -c -r1.136 -r1.137
*** src/usr.bin/tmux/cmd.c	2017/01/24 19:59:19	1.136
--- src/usr.bin/tmux/cmd.c	2017/04/21 20:26:34	1.137
***************
*** 1,4 ****
! /* $OpenBSD: cmd.c,v 1.136 2017/01/24 19:59:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd.c,v 1.137 2017/04/21 20:26:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 454,460 ****
  {
  	int			 targetflags, error;
  	struct cmd_find_state	*fs = NULL;
- 	struct cmd_find_state	 current;
  
  	if (flag == CMD_NONE ||
  	    flag == CMD_CLIENT ||
--- 454,459 ----
***************
*** 511,525 ****
  	}
  	log_debug("%s: flag %c %d %#x", __func__, c, flag, targetflags);
  
- 	error = cmd_find_current(&current, item, targetflags);
- 	if (error != 0) {
- 		if (~targetflags & CMD_FIND_QUIET)
- 			return (-1);
- 		cmd_find_clear_state(&current, NULL, 0);
- 	}
- 	if (!cmd_find_empty_state(&current) && !cmd_find_valid_state(&current))
- 		fatalx("invalid current state");
- 
  	switch (flag) {
  	case CMD_NONE:
  	case CMD_CLIENT:
--- 510,515 ----
***************
*** 529,542 ****
  	case CMD_SESSION_CANFAIL:
  	case CMD_SESSION_PREFERUNATTACHED:
  	case CMD_SESSION_WITHPANE:
! 		error = cmd_find_target(fs, &current, item, target,
! 		    CMD_FIND_SESSION, targetflags);
  		if (error != 0)
  			goto error;
  		break;
  	case CMD_MOVEW_R:
! 		error = cmd_find_target(fs, &current, item, target,
! 		    CMD_FIND_SESSION, CMD_FIND_QUIET);
  		if (error == 0)
  			break;
  		/* FALLTHROUGH */
--- 519,532 ----
  	case CMD_SESSION_CANFAIL:
  	case CMD_SESSION_PREFERUNATTACHED:
  	case CMD_SESSION_WITHPANE:
! 		error = cmd_find_target(fs, item, target, CMD_FIND_SESSION,
! 		    targetflags);
  		if (error != 0)
  			goto error;
  		break;
  	case CMD_MOVEW_R:
! 		error = cmd_find_target(fs, item, target, CMD_FIND_SESSION,
! 		    CMD_FIND_QUIET);
  		if (error == 0)
  			break;
  		/* FALLTHROUGH */
***************
*** 544,559 ****
  	case CMD_WINDOW_CANFAIL:
  	case CMD_WINDOW_MARKED:
  	case CMD_WINDOW_INDEX:
! 		error = cmd_find_target(fs, &current, item, target,
! 		    CMD_FIND_WINDOW, targetflags);
  		if (error != 0)
  			goto error;
  		break;
  	case CMD_PANE:
  	case CMD_PANE_CANFAIL:
  	case CMD_PANE_MARKED:
! 		error = cmd_find_target(fs, &current, item, target,
! 		    CMD_FIND_PANE, targetflags);
  		if (error != 0)
  			goto error;
  		break;
--- 534,549 ----
  	case CMD_WINDOW_CANFAIL:
  	case CMD_WINDOW_MARKED:
  	case CMD_WINDOW_INDEX:
! 		error = cmd_find_target(fs, item, target, CMD_FIND_WINDOW,
! 		    targetflags);
  		if (error != 0)
  			goto error;
  		break;
  	case CMD_PANE:
  	case CMD_PANE_CANFAIL:
  	case CMD_PANE_MARKED:
! 		error = cmd_find_target(fs, item, target, CMD_FIND_PANE,
! 		    targetflags);
  		if (error != 0)
  			goto error;
  		break;
***************
*** 565,571 ****
  error:
  	if (~targetflags & CMD_FIND_QUIET)
  		return (-1);
! 	cmd_find_clear_state(fs, NULL, 0);
  	return (0);
  }
  
--- 555,561 ----
  error:
  	if (~targetflags & CMD_FIND_QUIET)
  		return (-1);
! 	cmd_find_clear_state(fs, 0);
  	return (0);
  }
  
***************
*** 584,591 ****
  	free(tmp);
  
  	state->c = NULL;
! 	cmd_find_clear_state(&state->tflag, NULL, 0);
! 	cmd_find_clear_state(&state->sflag, NULL, 0);
  
  	flag = cmd->entry->cflag;
  	if (flag == CMD_NONE) {
--- 574,581 ----
  	free(tmp);
  
  	state->c = NULL;
! 	cmd_find_clear_state(&state->tflag, 0);
! 	cmd_find_clear_state(&state->sflag, 0);
  
  	flag = cmd->entry->cflag;
  	if (flag == CMD_NONE) {