===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -c -r1.236 -r1.237
*** src/usr.bin/tmux/window-copy.c	2019/10/19 19:20:14	1.236
--- src/usr.bin/tmux/window-copy.c	2019/10/23 07:42:05	1.237
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.236 2019/10/19 19:20:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.237 2019/10/23 07:42:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 564,569 ****
--- 564,570 ----
  window_copy_formats(struct window_mode_entry *wme, struct format_tree *ft)
  {
  	struct window_copy_mode_data	*data = wme->data;
+ 	char				*s;
  
  	format_add(ft, "scroll_position", "%d", data->oy);
  	format_add(ft, "rectangle_toggle", "%d", data->rectflag);
***************
*** 577,582 ****
--- 578,595 ----
  		format_add(ft, "selection_start_y", "%d", data->sely);
  		format_add(ft, "selection_end_x", "%d", data->endselx);
  		format_add(ft, "selection_end_y", "%d", data->endsely);
+ 	}
+ 
+ 	s = format_grid_word(data->screen.grid, data->cx, data->cy);
+ 	if (s != NULL) {
+ 		format_add(ft, "copy_cursor_word", "%s", s);
+ 		free(s);
+ 	}
+ 
+ 	s = format_grid_line(data->screen.grid, data->cy);
+ 	if (s != NULL) {
+ 		format_add(ft, "copy_cursor_line", "%s", s);
+ 		free(s);
  	}
  }