===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -c -r1.225 -r1.226
*** src/usr.bin/tmux/window-copy.c	2019/06/05 19:00:36	1.225
--- src/usr.bin/tmux/window-copy.c	2019/06/13 20:38:05	1.226
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.225 2019/06/05 19:00:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.226 2019/06/13 20:38:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 3027,3034 ****
  	if (data->lineflag == LINE_SEL_LEFT_RIGHT && oy == data->sely)
  		window_copy_other_end(wme);
  
- 	data->cx = data->lastcx;
  	if (scroll_only || data->cy == 0) {
  		window_copy_scroll_down(wme, 1);
  		if (scroll_only) {
  			if (data->cy == screen_size_y(s) - 1)
--- 3027,3034 ----
  	if (data->lineflag == LINE_SEL_LEFT_RIGHT && oy == data->sely)
  		window_copy_other_end(wme);
  
  	if (scroll_only || data->cy == 0) {
+ 		data->cx = data->lastcx;
  		window_copy_scroll_down(wme, 1);
  		if (scroll_only) {
  			if (data->cy == screen_size_y(s) - 1)
***************
*** 3037,3043 ****
  				window_copy_redraw_lines(wme, data->cy, 2);
  		}
  	} else {
! 		window_copy_update_cursor(wme, data->cx, data->cy - 1);
  		if (window_copy_update_selection(wme, 1)) {
  			if (data->cy == screen_size_y(s) - 1)
  				window_copy_redraw_lines(wme, data->cy, 1);
--- 3037,3043 ----
  				window_copy_redraw_lines(wme, data->cy, 2);
  		}
  	} else {
! 		window_copy_update_cursor(wme, data->lastcx, data->cy - 1);
  		if (window_copy_update_selection(wme, 1)) {
  			if (data->cy == screen_size_y(s) - 1)
  				window_copy_redraw_lines(wme, data->cy, 1);
***************
*** 3077,3089 ****
  	if (data->lineflag == LINE_SEL_RIGHT_LEFT && oy == data->endsely)
  		window_copy_other_end(wme);
  
- 	data->cx = data->lastcx;
  	if (scroll_only || data->cy == screen_size_y(s) - 1) {
  		window_copy_scroll_up(wme, 1);
  		if (scroll_only && data->cy > 0)
  			window_copy_redraw_lines(wme, data->cy - 1, 2);
  	} else {
! 		window_copy_update_cursor(wme, data->cx, data->cy + 1);
  		if (window_copy_update_selection(wme, 1))
  			window_copy_redraw_lines(wme, data->cy - 1, 2);
  	}
--- 3077,3089 ----
  	if (data->lineflag == LINE_SEL_RIGHT_LEFT && oy == data->endsely)
  		window_copy_other_end(wme);
  
  	if (scroll_only || data->cy == screen_size_y(s) - 1) {
+ 		data->cx = data->lastcx;
  		window_copy_scroll_up(wme, 1);
  		if (scroll_only && data->cy > 0)
  			window_copy_redraw_lines(wme, data->cy - 1, 2);
  	} else {
! 		window_copy_update_cursor(wme, data->lastcx, data->cy + 1);
  		if (window_copy_update_selection(wme, 1))
  			window_copy_redraw_lines(wme, data->cy - 1, 2);
  	}