diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-09-12 18:01:12 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-09-12 18:01:12 +0100 |
| commit | a5b29a1250c321d08b227120b4d9e835297e7acd (patch) | |
| tree | b9324a9c18be232633b9e8ba6ae749e95178dad3 /window-copy.c | |
| parent | 060515684dd2f3d471cc801920495426368b6ecf (diff) | |
| parent | 2e5584c2b41df1c1b836c3229ea78f8ea3d81054 (diff) | |
| download | rtmux-a5b29a1250c321d08b227120b4d9e835297e7acd.tar.gz rtmux-a5b29a1250c321d08b227120b4d9e835297e7acd.tar.bz2 rtmux-a5b29a1250c321d08b227120b4d9e835297e7acd.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/window-copy.c b/window-copy.c index dfd0dc06..320cc3d4 100644 --- a/window-copy.c +++ b/window-copy.c @@ -538,7 +538,9 @@ window_copy_key(struct window_pane *wp, struct client *c, struct session *sess, return; } - cmd = mode_key_lookup(&data->mdata, key, &arg); + cmd = mode_key_lookup(&data->mdata, key, &arg, &np); + if (data->numprefix > 0) + np = data->numprefix; if (cmd != MODEKEYCOPY_PREVIOUSPAGE && cmd != MODEKEYCOPY_NEXTPAGE && cmd != MODEKEYCOPY_SCROLLUP && @@ -900,11 +902,11 @@ window_copy_key_input(struct window_pane *wp, key_code key) struct screen *s = &data->screen; const char *bufdata; size_t inputlen, n, bufsize; - int np; + u_int np; struct paste_buffer *pb; u_char ch; - switch (mode_key_lookup(&data->mdata, key, NULL)) { + switch (mode_key_lookup(&data->mdata, key, NULL, &np)) { case MODEKEYEDIT_CANCEL: data->numprefix = -1; return (-1); @@ -932,10 +934,8 @@ window_copy_key_input(struct window_pane *wp, key_code key) data->inputstr[inputlen + n] = '\0'; break; case MODEKEYEDIT_ENTER: - np = data->numprefix; - if (np <= 0) - np = 1; - + if (data->numprefix > 0) + np = data->numprefix; switch (data->inputtype) { case WINDOW_COPY_OFF: case WINDOW_COPY_JUMPFORWARD: |