circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-14 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-28 21:02:28 +01:00
commit c96957583f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arguments.c
View File

@ -210,6 +210,8 @@ args_escape(const char *s)
char *escaped, *result; char *escaped, *result;
int flags; int flags;
if (*s == '\0')
return (xstrdup(s));
if ((strchr(quoted, s[0]) != NULL || s[0] == '~') && s[1] == '\0') { if ((strchr(quoted, s[0]) != NULL || s[0] == '~') && s[1] == '\0') {
xasprintf(&escaped, "\\%c", s[0]); xasprintf(&escaped, "\\%c", s[0]);
return (escaped); return (escaped);

6
status.c
View File

@ -348,10 +348,8 @@ status_redraw(struct client *c)
/* Resize the target screen. */ /* Resize the target screen. */
if (screen_size_x(&sl->screen) != width || if (screen_size_x(&sl->screen) != width ||
screen_size_y(&sl->screen) != lines) { screen_size_y(&sl->screen) != lines) {
if (screen_size_x(&sl->screen) != width)
force = 1;
screen_resize(&sl->screen, width, lines, 0); screen_resize(&sl->screen, width, lines, 0);
changed = 1; changed = force = 1;
} }
screen_write_start(&ctx, NULL, &sl->screen); screen_write_start(&ctx, NULL, &sl->screen);
@ -865,7 +863,7 @@ status_prompt_paste(struct client *c)
if ((pb = paste_get_top(NULL)) == NULL) if ((pb = paste_get_top(NULL)) == NULL)
return (0); return (0);
bufdata = paste_buffer_data(pb, &bufsize); bufdata = paste_buffer_data(pb, &bufsize);
ud = xreallocarray(NULL, bufsize, sizeof *ud); ud = xreallocarray(NULL, bufsize + 1, sizeof *ud);
udp = ud; udp = ud;
for (i = 0; i != bufsize; /* nothing */) { for (i = 0; i != bufsize; /* nothing */) {
more = utf8_open(udp, bufdata[i]); more = utf8_open(udp, bufdata[i]);