circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-08-17 22:01:18 +01:00
parent bacae4b4ad 5fdea440ce
commit a8be47f0f4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-command-prompt.c
View File

@@ -79,6 +79,8 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
if (tc->prompt_string != NULL) if (tc->prompt_string != NULL)
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
if (args_has(args, 'i'))
wait = 0;
cdata = xcalloc(1, sizeof *cdata); cdata = xcalloc(1, sizeof *cdata);
cdata->idx = 1; cdata->idx = 1;

2
cmd-pipe-pane.c
View File

@@ -44,7 +44,7 @@ const struct cmd_entry cmd_pipe_pane_entry = {
.alias = "pipep", .alias = "pipep",
.args = { "IOot:", 0, 1 }, .args = { "IOot:", 0, 1 },
.usage = "[-IOo] " CMD_TARGET_PANE_USAGE " [command]", .usage = "[-IOo] " CMD_TARGET_PANE_USAGE " [shell-command]",
.target = { 't', CMD_FIND_PANE, 0 }, .target = { 't', CMD_FIND_PANE, 0 },

4
control.c
View File

@@ -664,7 +664,7 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
uint64_t age, t = get_timer(); uint64_t age, t = get_timer();
wp = control_window_pane(c, cp->pane); wp = control_window_pane(c, cp->pane);
if (wp == NULL) { if (wp == NULL || wp->fd == -1) {
TAILQ_FOREACH_SAFE(cb, &cp->blocks, entry, cb1) { TAILQ_FOREACH_SAFE(cb, &cp->blocks, entry, cb1) {
TAILQ_REMOVE(&cp->blocks, cb, entry); TAILQ_REMOVE(&cp->blocks, cb, entry);
control_free_block(cs, cb); control_free_block(cs, cb);
@@ -864,7 +864,7 @@ control_check_subs_pane(struct client *c, struct control_sub *csub)
struct control_sub_pane *csp, find; struct control_sub_pane *csp, find;
wp = window_pane_find_by_id(csub->id); wp = window_pane_find_by_id(csub->id);
if (wp == NULL) if (wp == NULL || wp->fd == -1)
return; return;
w = wp->window; w = wp->window;