===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-copy-mode.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/tmux/cmd-copy-mode.c	2020/04/13 08:26:27	1.42
--- src/usr.bin/tmux/cmd-copy-mode.c	2020/04/13 10:59:58	1.43
***************
*** 1,4 ****
! /* $OpenBSD: cmd-copy-mode.c,v 1.42 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-copy-mode.c,v 1.43 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 57,66 ****
  cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
! 	struct cmdq_shared	*shared = item->shared;
! 	struct client		*c = item->client;
  	struct session		*s;
! 	struct window_pane	*wp = item->target.wp, *swp;
  
  	if (args_has(args, 'q')) {
  		window_pane_reset_mode_all(wp);
--- 57,68 ----
  cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
! 	struct cmdq_shared	*shared = cmdq_get_shared(item);
! 	struct cmd_find_state	*source = cmdq_get_source(item);
! 	struct cmd_find_state	*target = cmdq_get_target(item);
! 	struct client		*c = cmdq_get_client(item);
  	struct session		*s;
! 	struct window_pane	*wp = target->wp, *swp;
  
  	if (args_has(args, 'q')) {
  		window_pane_reset_mode_all(wp);
***************
*** 80,86 ****
  	}
  
  	if (args_has(args, 's'))
! 		swp = item->source.wp;
  	else
  		swp = wp;
  	if (!window_pane_set_mode(wp, swp, &window_copy_mode, NULL, args)) {
--- 82,88 ----
  	}
  
  	if (args_has(args, 's'))
! 		swp = source->wp;
  	else
  		swp = wp;
  	if (!window_pane_set_mode(wp, swp, &window_copy_mode, NULL, args)) {