circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-21 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-07 15:00:06 +01:00
parent 72f5415fc8 0256ee77c2
commit 59151704b4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd-split-window.c
View File

@@ -101,12 +101,17 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
flags |= SPAWN_FULLSIZE; flags |= SPAWN_FULLSIZE;
input = args_has(args, 'I'); input = args_has(args, 'I');
empty = (count == 1 && *args_string(args, 0) == '\0'); if (input)
if (!empty && (input || args_has(args, 'E'))) { empty = 1;
else
empty = args_has(args, 'E');
if (empty &&
count != 0 &&
(count != 1 || *args_string(args, 0) != '\0')) {
cmdq_error(item, "command cannot be given for empty pane"); cmdq_error(item, "command cannot be given for empty pane");
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
if (input || empty || args_has(args, 'E')) if (empty)
flags |= SPAWN_EMPTY; flags |= SPAWN_EMPTY;
if (is_floating) if (is_floating)

3
options-table.c
View File

@@ -1028,7 +1028,8 @@ const struct options_table_entry options_table[] = {
.flags = OPTIONS_TABLE_IS_ARRAY, .flags = OPTIONS_TABLE_IS_ARRAY,
.default_str = "DISPLAY KRB5CCNAME MSYSTEM SSH_ASKPASS SSH_AUTH_SOCK " .default_str = "DISPLAY KRB5CCNAME MSYSTEM SSH_ASKPASS SSH_AUTH_SOCK "
"SSH_AGENT_PID SSH_CONNECTION WAYLAND_DISPLAY " "SSH_AGENT_PID SSH_CONNECTION WAYLAND_DISPLAY "
"WINDOWID XAUTHORITY", "WINDOWID XAUTHORITY XDG_CURRENT_DESKTOP "
"XDG_SESSION_DESKTOP XDG_SESSION_TYPE",
.text = "List of environment variables to update in the session " .text = "List of environment variables to update in the session "
"environment when a client is attached." "environment when a client is attached."
}, },