diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-10-02 09:29:48 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-10-02 09:29:48 +0100 |
| commit | 931c17ed4f3ac18470f5b385210d61b24a57b5d4 (patch) | |
| tree | 6dbcfe073cec1ba8f34626bdfa04123b621eb9ed /window-copy.c | |
| parent | 24d9dc518de6761f645165d49f321b2b56904fb5 (diff) | |
| parent | 2874a431c050527244a56e7f241baf053c722f88 (diff) | |
| download | rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.gz rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.bz2 rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/window-copy.c b/window-copy.c index 0775bcb9..3ac994d3 100644 --- a/window-copy.c +++ b/window-copy.c @@ -199,6 +199,7 @@ window_copy_init(struct window_pane *wp) mode_key_init(&data->mdata, &mode_key_tree_emacs_copy); else mode_key_init(&data->mdata, &mode_key_tree_vi_copy); + s->sel.modekeys = keys; data->backing = NULL; @@ -428,7 +429,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key) window_pane_reset_mode(wp); return; case MODEKEYCOPY_OTHEREND: - for (; np != 0; np--) + if (np % 2) window_copy_other_end(wp); break; case MODEKEYCOPY_LEFT: @@ -1497,8 +1498,8 @@ window_copy_copy_pipe(struct window_pane *wp, struct session *sess, void window_copy_copy_selection(struct window_pane *wp, const char *bufname) { - void* buf; - size_t len; + void *buf; + size_t len; buf = window_copy_get_selection(wp, &len); if (buf == NULL) |