===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** src/usr.bin/tmux/status.c	2011/12/01 20:42:31	1.82
--- src/usr.bin/tmux/status.c	2012/01/20 19:10:29	1.83
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.82 2011/12/01 20:42:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.83 2012/01/20 19:10:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 978,984 ****
  	struct paste_buffer	*pb;
  	char			*s, *first, *last, word[64], swapc;
  	const char		*histstr;
! 	const char		*wsep;
  	u_char			 ch;
  	size_t			 size, n, off, idx;
  
--- 978,984 ----
  	struct paste_buffer	*pb;
  	char			*s, *first, *last, word[64], swapc;
  	const char		*histstr;
! 	const char		*wsep = NULL;
  	u_char			 ch;
  	size_t			 size, n, off, idx;
  
***************
*** 1124,1131 ****
  		c->prompt_index = idx;
  		c->flags |= CLIENT_STATUS;
  		break;
  	case MODEKEYEDIT_NEXTWORD:
! 		wsep = options_get_string(oo, "word-separators");
  
  		/* Find a separator. */
  		while (c->prompt_index != size) {
--- 1124,1135 ----
  		c->prompt_index = idx;
  		c->flags |= CLIENT_STATUS;
  		break;
+ 	case MODEKEYEDIT_NEXTSPACE:
+ 		wsep = " ";
+ 		/* FALLTHROUGH */
  	case MODEKEYEDIT_NEXTWORD:
! 		if (wsep == NULL)
! 			wsep = options_get_string(oo, "word-separators");
  
  		/* Find a separator. */
  		while (c->prompt_index != size) {
***************
*** 1143,1150 ****
  
  		c->flags |= CLIENT_STATUS;
  		break;
  	case MODEKEYEDIT_NEXTWORDEND:
! 		wsep = options_get_string(oo, "word-separators");
  
  		/* Find a word. */
  		while (c->prompt_index != size) {
--- 1147,1158 ----
  
  		c->flags |= CLIENT_STATUS;
  		break;
+ 	case MODEKEYEDIT_NEXTSPACEEND:
+ 		wsep = " ";
+ 		/* FALLTHROUGH */
  	case MODEKEYEDIT_NEXTWORDEND:
! 		if (wsep == NULL)
! 			wsep = options_get_string(oo, "word-separators");
  
  		/* Find a word. */
  		while (c->prompt_index != size) {
***************
*** 1162,1169 ****
  
  		c->flags |= CLIENT_STATUS;
  		break;
  	case MODEKEYEDIT_PREVIOUSWORD:
! 		wsep = options_get_string(oo, "word-separators");
  
  		/* Find a non-separator. */
  		while (c->prompt_index != 0) {
--- 1170,1181 ----
  
  		c->flags |= CLIENT_STATUS;
  		break;
+ 	case MODEKEYEDIT_PREVIOUSSPACE:
+ 		wsep = " ";
+ 		/* FALLTHROUGH */
  	case MODEKEYEDIT_PREVIOUSWORD:
! 		if (wsep == NULL)
! 			wsep = options_get_string(oo, "word-separators");
  
  		/* Find a non-separator. */
  		while (c->prompt_index != 0) {