summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm>2019-05-28 18:53:36 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2019-05-28 21:04:35 +0100
commit8d137233a96c86d311f7f03c3322177a5e54d3fa (patch)
treeec0e808aa22d03766b813b8f331aac1991b4c540
parent05d07413ff825553e65e24f4561ce3c97081b375 (diff)
Redraw status line if size changes, GitHub issue 1762. Also fix length
of target buffer when pasting into status line.
-rw-r--r--status.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/status.c b/status.c
index ce36cc3c..0f96f0d3 100644
--- a/status.c
+++ b/status.c
@@ -348,10 +348,8 @@ status_redraw(struct client *c)
/* Resize the target screen. */
if (screen_size_x(&sl->screen) != width ||
screen_size_y(&sl->screen) != lines) {
- if (screen_size_x(&sl->screen) != width)
- force = 1;
screen_resize(&sl->screen, width, lines, 0);
- changed = 1;
+ changed = force = 1;
}
screen_write_start(&ctx, NULL, &sl->screen);
@@ -865,7 +863,7 @@ status_prompt_paste(struct client *c)
if ((pb = paste_get_top(NULL)) == NULL)
return (0);
bufdata = paste_buffer_data(pb, &bufsize);
- ud = xreallocarray(NULL, bufsize, sizeof *ud);
+ ud = xreallocarray(NULL, bufsize + 1, sizeof *ud);
udp = ud;
for (i = 0; i != bufsize; /* nothing */) {
more = utf8_open(udp, bufdata[i]);