===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/window-copy.c	2009/07/12 16:12:34	1.5
--- src/usr.bin/tmux/window-copy.c	2009/07/12 16:15:34	1.6
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.5 2009/07/12 16:12:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.6 2009/07/12 16:15:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 50,55 ****
--- 50,56 ----
  u_int	window_copy_find_length(struct window_pane *, u_int);
  void	window_copy_set_cursor_x(struct window_pane *, u_int);
  void	window_copy_cursor_start_of_line(struct window_pane *);
+ void	window_copy_cursor_back_to_indentation(struct window_pane *);
  void	window_copy_cursor_end_of_line(struct window_pane *);
  void	window_copy_cursor_left(struct window_pane *);
  void	window_copy_cursor_right(struct window_pane *);
***************
*** 207,212 ****
--- 208,216 ----
  	case MODEKEYCMD_STARTOFLINE:
  		window_copy_cursor_start_of_line(wp);
  		break;
+ 	case MODEKEYCMD_BACKTOINDENTATION:
+ 		window_copy_cursor_back_to_indentation(wp);
+ 		break;
  	case MODEKEYCMD_ENDOFLINE:
  		window_copy_cursor_end_of_line(wp);
  		break;
***************
*** 598,603 ****
--- 602,634 ----
  		window_copy_redraw_lines(wp, data->cy, 1);
  	else
  		window_copy_update_cursor(wp);
+ }
+ 
+ void
+ window_copy_cursor_back_to_indentation(struct window_pane *wp)
+ {
+ 	struct window_copy_mode_data	*data = wp->modedata;
+ 	u_int				 px, py, xx;
+ 	const struct grid_cell		*gc;
+ 
+ 	px = 0;
+ 	py = screen_hsize(&wp->base) + data->cy - data->oy;
+ 	xx = window_copy_find_length(wp, py);
+ 
+ 	/*
+ 	 * Don't use window_copy_is_space because that treats some word
+ 	 * delimiters as spaces.
+ 	 */
+ 	while (px < xx) {
+ 		gc = grid_peek_cell(wp->base.grid, px, py);
+ 		if (gc->flags & GRID_FLAG_UTF8)
+ 			break;
+ 		if (gc->data != ' ')
+ 			break;
+ 		px++;
+ 	}
+ 
+ 	window_copy_set_cursor_x(wp, px);
  }
  
  void