diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-05-09 12:51:41 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-05-09 12:52:38 +0100 |
| commit | 504b97b6a4314a7a052d9b05de746515e2a03628 (patch) | |
| tree | 6b6316b7f7d35725bd0ce2377adae1847cc324da /cmd-capture-pane.c | |
| parent | 6525ca51584636ef781bda147d37d5d0d10899e0 (diff) | |
| parent | 92faa2eaebd32117f01b0b7d7ae81abdfde2d935 (diff) | |
| download | rtmux-504b97b6a4314a7a052d9b05de746515e2a03628.tar.gz rtmux-504b97b6a4314a7a052d9b05de746515e2a03628.tar.bz2 rtmux-504b97b6a4314a7a052d9b05de746515e2a03628.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.h
Diffstat (limited to 'cmd-capture-pane.c')
| -rw-r--r-- | cmd-capture-pane.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index b44ebe9d..a348e155 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -57,15 +57,17 @@ char * cmd_capture_pane_pending(struct args *args, struct window_pane *wp, size_t *len) { - char *buf, *line, tmp[5]; - size_t linelen; - u_int i; + struct evbuffer *pending; + char *buf, *line, tmp[5]; + size_t linelen; + u_int i; - if (wp->ictx.since_ground == NULL) + pending = input_pending(wp); + if (pending == NULL) return (xstrdup("")); - line = EVBUFFER_DATA(wp->ictx.since_ground); - linelen = EVBUFFER_LENGTH(wp->ictx.since_ground); + line = EVBUFFER_DATA(pending); + linelen = EVBUFFER_LENGTH(pending); buf = xstrdup(""); if (args_has(args, 'C')) { |