The branch, master has been updated
via c190c73240576aa2a8274a305844f1fa7fcb0e71 (commit)
via a9ebb62d54650dd2e8e36acea8f62f3b3f108477 (commit)
from e8567098a4eaa81306effeaef430d9d74f603f7a (commit)
- Log -----------------------------------------------------------------
commit c190c73240576aa2a8274a305844f1fa7fcb0e71
Merge: e856709 a9ebb62
Author: Thomas Adam <[email protected]>
Commit: Thomas Adam <[email protected]>
Merge branch 'obsd-master'
window-copy.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
commit a9ebb62d54650dd2e8e36acea8f62f3b3f108477
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Make next-word-end work properly with vi(1) keys, reported by patrick
keshishian.
---
window-copy.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/window-copy.c b/window-copy.c
index 9d4ff20..7a647c5 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);
-----------------------------------------------------------------------
Summary of changes:
window-copy.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
