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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-06-16 02:01:07 +01:00
parent 1dbceaa790 d82d9468b4
commit 43e88c892d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
job.c
View File

@@ -174,7 +174,8 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e,
closefrom(STDERR_FILENO + 1); closefrom(STDERR_FILENO + 1);
if (cmd != NULL) { if (cmd != NULL) {
setenv("SHELL", shell, 1); if (flags & JOB_DEFAULTSHELL)
setenv("SHELL", shell, 1);
execl(shell, argv0, "-c", cmd, (char *)NULL); execl(shell, argv0, "-c", cmd, (char *)NULL);
fatal("execl failed"); fatal("execl failed");
} else { } else {

4
options-table.c
View File

@@ -1052,7 +1052,7 @@ const struct options_table_entry options_table[] = {
{ .name = "copy-mode-position-style", { .name = "copy-mode-position-style",
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW, .scope = OPTIONS_TABLE_WINDOW,
.default_str = "#{mode-style}", .default_str = "#{E:mode-style}",
.flags = OPTIONS_TABLE_IS_STYLE, .flags = OPTIONS_TABLE_IS_STYLE,
.separator = ",", .separator = ",",
.text = "Style of position indicator in copy mode." .text = "Style of position indicator in copy mode."
@@ -1061,7 +1061,7 @@ const struct options_table_entry options_table[] = {
{ .name = "copy-mode-selection-style", { .name = "copy-mode-selection-style",
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_WINDOW, .scope = OPTIONS_TABLE_WINDOW,
.default_str = "#{mode-style}", .default_str = "#{E:mode-style}",
.flags = OPTIONS_TABLE_IS_STYLE, .flags = OPTIONS_TABLE_IS_STYLE,
.separator = ",", .separator = ",",
.text = "Style of selection in copy mode." .text = "Style of selection in copy mode."