circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-04 18:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-30 23:02:27 +01:00
commit 41b8bb4eef
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-display-message.c
View File

@ -109,8 +109,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
format_defaults(ft, target_c, s, wl, wp); format_defaults(ft, target_c, s, wl, wp);
if (args_has(args, 'a')) { if (args_has(args, 'a')) {
if (item != NULL) format_each(ft, cmd_display_message_each, item);
format_each(ft, cmd_display_message_each, item);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }

1
input.c
View File

@ -2409,7 +2409,6 @@ input_osc_52(struct input_ctx *ictx, const char *p)
outlen = 4 * ((len + 2) / 3) + 1; outlen = 4 * ((len + 2) / 3) + 1;
out = xmalloc(outlen); out = xmalloc(outlen);
if ((outlen = b64_ntop(buf, len, out, outlen)) == -1) { if ((outlen = b64_ntop(buf, len, out, outlen)) == -1) {
abort();
free(out); free(out);
return; return;
} }

2
mode-tree.c
View File

@ -480,7 +480,7 @@ mode_tree_add(struct mode_tree_data *mtd, struct mode_tree_item *parent,
saved = mode_tree_find_item(&mtd->saved, tag); saved = mode_tree_find_item(&mtd->saved, tag);
if (saved != NULL) { if (saved != NULL) {
if (parent == NULL || (parent != NULL && parent->expanded)) if (parent == NULL || parent->expanded)
mti->tagged = saved->tagged; mti->tagged = saved->tagged;
mti->expanded = saved->expanded; mti->expanded = saved->expanded;
} else if (expanded == -1) } else if (expanded == -1)

3
options.c
View File

@ -365,7 +365,8 @@ options_array_set(struct options_entry *o, u_int idx, const char *value,
pr = cmd_parse_from_string(value, NULL); pr = cmd_parse_from_string(value, NULL);
switch (pr->status) { switch (pr->status) {
case CMD_PARSE_EMPTY: case CMD_PARSE_EMPTY:
*cause = xstrdup("empty command"); if (cause != NULL)
*cause = xstrdup("empty command");
return (-1); return (-1);
case CMD_PARSE_ERROR: case CMD_PARSE_ERROR:
if (cause != NULL) if (cause != NULL)

2
window.c
View File

@ -1137,7 +1137,7 @@ window_pane_reset_mode(struct window_pane *wp)
} else { } else {
log_debug("%s: next mode is %s", __func__, next->mode->name); log_debug("%s: next mode is %s", __func__, next->mode->name);
wp->screen = next->screen; wp->screen = next->screen;
if (next != NULL && next->mode->resize != NULL) if (next->mode->resize != NULL)
next->mode->resize(next, wp->sx, wp->sy); next->mode->resize(next, wp->sx, wp->sy);
} }
wp->flags |= (PANE_REDRAW|PANE_CHANGED); wp->flags |= (PANE_REDRAW|PANE_CHANGED);