circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

pull/2851/head
Thomas Adam 2021-08-22 16:01:19 +01:00
parent 324f87cf14 72d905f32c
commit 03054598df
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-display-menu.c
View File

@ -120,8 +120,6 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
if (sr != NULL)
break;
}
if (line == lines)
ranges = &tc->status.entries[0].ranges;
if (sr != NULL) {
format_add(ft, "popup_window_status_line_x", "%u",

2
cmd-parse.y
View File

@ -772,7 +772,7 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
TAILQ_REMOVE(&cmd->arguments, first, entry);
cmd_parse_free_argument(first);
after = TAILQ_NEXT(TAILQ_FIRST(&last->arguments), entry);
after = TAILQ_FIRST(&last->arguments);
TAILQ_FOREACH_SAFE(arg, &cmd->arguments, entry, arg1) {
TAILQ_REMOVE(&cmd->arguments, arg, entry);
if (after == NULL)

2
cmd-source-file.c
View File

@ -179,12 +179,12 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
free(pattern);
continue;
}
free(expanded);
free(pattern);
for (j = 0; j < g.gl_pathc; j++)
cmd_source_file_add(cdata, g.gl_pathv[j]);
}
free(expanded);
cdata->after = item;
cdata->retval = retval;

4
file.c
View File

@ -555,7 +555,7 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer,
log_debug("open write file %d %s", msg->stream, path);
find.stream = msg->stream;
if ((cf = RB_FIND(client_files, files, &find)) != NULL) {
if (RB_FIND(client_files, files, &find) != NULL) {
error = EBADF;
goto reply;
}
@ -714,7 +714,7 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer,
log_debug("open read file %d %s", msg->stream, path);
find.stream = msg->stream;
if ((cf = RB_FIND(client_files, files, &find)) != NULL) {
if (RB_FIND(client_files, files, &find) != NULL) {
error = EBADF;
goto reply;
}

2
server-client.c
View File

@ -277,7 +277,7 @@ server_client_open(struct client *c, char **cause)
static void
server_client_attached_lost(struct client *c)
{
struct session *s = c->session;
struct session *s;
struct window *w;
struct client *loop;
struct client *found;