===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** src/usr.bin/tmux/status.c	2013/07/05 14:38:22	1.105
--- src/usr.bin/tmux/status.c	2013/07/05 14:41:36	1.106
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.105 2013/07/05 14:38:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.106 2013/07/05 14:41:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 938,943 ****
--- 938,944 ----
  	off = 0;
  
  	memcpy(&gc, &grid_default_cell, sizeof gc);
+ 
  	/* Change colours for command mode. */
  	if (c->prompt_mdata.mode == 1) {
  		colour_set_fg(&gc, options_get_number(&s->options, "message-command-fg"));
***************
*** 1192,1197 ****
--- 1193,1203 ----
  			if (strchr(wsep, c->prompt_buffer[c->prompt_index]))
  				break;
  		}
+ 
+ 		/* Back up to the end-of-word like vi. */
+ 		if (options_get_number(oo, "status-keys") == MODEKEY_VI &&
+ 		    c->prompt_index != 0)
+ 			c->prompt_index--;
  
  		c->flags |= CLIENT_STATUS;
  		break;