===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- src/usr.bin/tmux/window-copy.c	2013/07/05 14:44:06	1.93
+++ src/usr.bin/tmux/window-copy.c	2013/07/12 09:52:36	1.94
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.93 2013/07/05 14:44:06 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.94 2013/07/12 09:52:36 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1897,13 +1897,17 @@
 	struct options			*oo = &wp->window->options;
 	struct screen			*back_s = data->backing;
 	u_int				 px, py, xx, yy;
-	int				 expected = 1;
+	int				 keys, expected = 1;
 
 	px = data->cx;
 	py = screen_hsize(back_s) + data->cy - data->oy;
 	xx = window_copy_find_length(wp, py);
 	yy = screen_hsize(back_s) + screen_size_y(back_s) - 1;
 
+	keys = options_get_number(oo, "mode-keys");
+	if (keys == MODEKEY_VI && !window_copy_in_set(wp, px, py, separators))
+		px++;
+
 	/*
 	 * First skip past any word characters, then any nonword characters.
 	 *
@@ -1928,8 +1932,7 @@
 		expected = !expected;
 	} while (expected == 0);
 
-	/* Back up to the end-of-word like vi. */
-	if (options_get_number(oo, "status-keys") == MODEKEY_VI && px != 0)
+	if (keys == MODEKEY_VI && px != 0)
 		px--;
 
 	window_copy_update_cursor(wp, px, data->cy);