diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-02-11 08:01:30 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-02-11 08:01:30 +0000 |
| commit | a4d8437bc2de38667a85e68f208dace0938baf07 (patch) | |
| tree | e6fa2dd371792b777a904a3b0605fba0e7aa8717 | |
| parent | 470cba356d8c81b4c669ef5d37a9798edf45d36f (diff) | |
| parent | dc882adb2e439e1721458adc58c9bb09f80fbe77 (diff) | |
| download | rtmux-a4d8437bc2de38667a85e68f208dace0938baf07.tar.gz rtmux-a4d8437bc2de38667a85e68f208dace0938baf07.tar.bz2 rtmux-a4d8437bc2de38667a85e68f208dace0938baf07.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | server-client.c | 2 | ||||
| -rw-r--r-- | tmux.1 | 1 | ||||
| -rw-r--r-- | window-buffer.c | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/server-client.c b/server-client.c index 3253307d..513a760e 100644 --- a/server-client.c +++ b/server-client.c @@ -1704,7 +1704,6 @@ static void server_client_dispatch(struct imsg *imsg, void *arg) { struct client *c = arg; - const char *data; ssize_t datalen; struct session *s; @@ -1716,7 +1715,6 @@ server_client_dispatch(struct imsg *imsg, void *arg) return; } - data = imsg->data; datalen = imsg->hdr.len - IMSG_HEADER_SIZE; switch (imsg->hdr.type) { @@ -2718,7 +2718,6 @@ also lists only keys in specifies a prefix to print before each key and .Fl 1 lists only the first matching key. -.Pp .It Xo Ic send-keys .Op Fl FHlMRX .Op Fl N Ar repeat-count diff --git a/window-buffer.c b/window-buffer.c index 39d98608..a1939b0f 100644 --- a/window-buffer.c +++ b/window-buffer.c @@ -209,7 +209,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata, struct paste_buffer *pb; const char *pdata, *start, *end; char *buf = NULL; - size_t psize, len; + size_t psize; u_int i, cx = ctx->s->cx, cy = ctx->s->cy; pb = paste_get_name(item->name); @@ -222,7 +222,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata, while (end != pdata + psize && *end != '\n') end++; buf = xreallocarray(buf, 4, end - start + 1); - len = utf8_strvis(buf, start, end - start, VIS_OCTAL|VIS_TAB); + utf8_strvis(buf, start, end - start, VIS_OCTAL|VIS_TAB); if (*buf != '\0') { screen_write_cursormove(ctx, cx, cy + i, 0); screen_write_nputs(ctx, sx, &grid_default_cell, "%s", |