mirror of
https://github.com/tmux/tmux.git
synced 2024-12-24 18:28:56 +00:00
Merge branch 'obsd-master' into master
This commit is contained in:
commit
fed7b29c7e
@ -75,13 +75,17 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
|
||||
if (args_has(args, 'I')) {
|
||||
if (wp == NULL)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
if (window_pane_start_input(wp, item, &cause) != 0) {
|
||||
switch (window_pane_start_input(wp, item, &cause)) {
|
||||
case -1:
|
||||
cmdq_error(item, "%s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
case 1:
|
||||
return (CMD_RETURN_NORMAL);
|
||||
case 0:
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
if (args_has(args, 'F') && count != 0) {
|
||||
cmdq_error(item, "only one of -F or argument must be given");
|
||||
|
@ -162,7 +162,9 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (input && window_pane_start_input(new_wp, item, &cause) != 0) {
|
||||
if (input) {
|
||||
switch (window_pane_start_input(new_wp, item, &cause)) {
|
||||
case -1:
|
||||
server_client_remove_pane(new_wp);
|
||||
layout_close_pane(new_wp);
|
||||
window_remove_pane(wp->window, new_wp);
|
||||
@ -172,6 +174,10 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
case 1:
|
||||
input = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!args_has(args, 'd'))
|
||||
cmd_find_from_winlink_pane(current, wl, new_wp, 0);
|
||||
|
1
tmux.1
1
tmux.1
@ -3996,6 +3996,7 @@ If set to both, a bell and a message are produced.
|
||||
Sets the session's conception of what characters are considered word
|
||||
separators, for the purposes of the next and previous word commands in
|
||||
copy mode.
|
||||
.El
|
||||
.Pp
|
||||
Available window options are:
|
||||
.Pp
|
||||
|
6
window.c
6
window.c
@ -1537,7 +1537,7 @@ window_pane_input_callback(struct client *c, __unused const char *path,
|
||||
size_t len = EVBUFFER_LENGTH(buffer);
|
||||
|
||||
wp = window_pane_find_by_id(cdata->wp);
|
||||
if (wp == NULL || closed || error != 0 || c->flags & CLIENT_DEAD) {
|
||||
if (wp == NULL || closed || error != 0 || (c->flags & CLIENT_DEAD)) {
|
||||
if (wp == NULL)
|
||||
c->flags |= CLIENT_EXIT;
|
||||
|
||||
@ -1563,6 +1563,10 @@ window_pane_start_input(struct window_pane *wp, struct cmdq_item *item,
|
||||
*cause = xstrdup("pane is not empty");
|
||||
return (-1);
|
||||
}
|
||||
if (c->flags & (CLIENT_DEAD|CLIENT_EXITED))
|
||||
return (1);
|
||||
if (c->session != NULL)
|
||||
return (1);
|
||||
|
||||
cdata = xmalloc(sizeof *cdata);
|
||||
cdata->item = item;
|
||||
|
Loading…
Reference in New Issue
Block a user