===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -c -r1.73 -r1.74
*** src/usr.bin/tmux/cmd-find.c	2019/06/12 09:10:29	1.73
--- src/usr.bin/tmux/cmd-find.c	2020/04/09 13:54:38	1.74
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.73 2019/06/12 09:10:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.74 2020/04/09 13:54:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1231,1259 ****
  static struct client *
  cmd_find_current_client(struct cmdq_item *item, int quiet)
  {
! 	struct client		*c;
  	struct session		*s;
  	struct window_pane	*wp;
  	struct cmd_find_state	 fs;
  
! 	if (item->client != NULL && item->client->session != NULL)
! 		return (item->client);
  
! 	c = NULL;
! 	if ((wp = cmd_find_inside_pane(item->client)) != NULL) {
  		cmd_find_clear_state(&fs, CMD_FIND_QUIET);
  		fs.w = wp->window;
  		if (cmd_find_best_session_with_window(&fs) == 0)
! 			c = cmd_find_best_client(fs.s);
  	} else {
  		s = cmd_find_best_session(NULL, 0, CMD_FIND_QUIET);
  		if (s != NULL)
! 			c = cmd_find_best_client(s);
  	}
! 	if (c == NULL && !quiet)
  		cmdq_error(item, "no current client");
! 	log_debug("%s: no target, return %p", __func__, c);
! 	return (c);
  }
  
  /* Find the target client or report an error and return NULL. */
--- 1231,1261 ----
  static struct client *
  cmd_find_current_client(struct cmdq_item *item, int quiet)
  {
! 	struct client		*c = NULL, *found;
  	struct session		*s;
  	struct window_pane	*wp;
  	struct cmd_find_state	 fs;
  
! 	if (item != NULL)
! 		c = item->client;
! 	if (c != NULL && c->session != NULL)
! 		return (c);
  
! 	found = NULL;
! 	if (c != NULL && (wp = cmd_find_inside_pane(c)) != NULL) {
  		cmd_find_clear_state(&fs, CMD_FIND_QUIET);
  		fs.w = wp->window;
  		if (cmd_find_best_session_with_window(&fs) == 0)
! 			found = cmd_find_best_client(fs.s);
  	} else {
  		s = cmd_find_best_session(NULL, 0, CMD_FIND_QUIET);
  		if (s != NULL)
! 			found = cmd_find_best_client(s);
  	}
! 	if (found == NULL && item != NULL && !quiet)
  		cmdq_error(item, "no current client");
! 	log_debug("%s: no target, return %p", __func__, found);
! 	return (found);
  }
  
  /* Find the target client or report an error and return NULL. */