diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-07-13 16:57:51 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-07-13 16:57:51 +0100 |
| commit | c190c73240576aa2a8274a305844f1fa7fcb0e71 (patch) | |
| tree | a1c596288aa9125d8b76148edf61e75106afeade /window-copy.c | |
| parent | e8567098a4eaa81306effeaef430d9d74f603f7a (diff) | |
| parent | a9ebb62d54650dd2e8e36acea8f62f3b3f108477 (diff) | |
| download | rtmux-c190c73240576aa2a8274a305844f1fa7fcb0e71.tar.gz rtmux-c190c73240576aa2a8274a305844f1fa7fcb0e71.tar.bz2 rtmux-c190c73240576aa2a8274a305844f1fa7fcb0e71.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/window-copy.c b/window-copy.c index 75fff92f..f690c7c4 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1897,13 +1897,17 @@ window_copy_cursor_next_word_end(struct window_pane *wp, const char *separators) 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 @@ window_copy_cursor_next_word_end(struct window_pane *wp, const char *separators) 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); |