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

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-07-14 12:01:21 +01:00
parent 0ea6cdca90 732c72c98e
commit e3ff887d2a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
options-table.c
View File

@@ -233,7 +233,7 @@ const struct options_table_entry options_table[] = {
{ .name = "default-terminal", { .name = "default-terminal",
.type = OPTIONS_TABLE_STRING, .type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_SERVER, .scope = OPTIONS_TABLE_SERVER,
.default_str = "screen", .default_str = TMUX_TERM,
.text = "Default for the 'TERM' environment variable." .text = "Default for the 'TERM' environment variable."
}, },

3
tmux.h
View File

@@ -75,6 +75,9 @@ struct winlink;
#ifndef TMUX_SOCK #ifndef TMUX_SOCK
#define TMUX_SOCK "$TMUX_TMPDIR:" _PATH_TMP #define TMUX_SOCK "$TMUX_TMPDIR:" _PATH_TMP
#endif #endif
#ifndef TMUX_TERM
#define TMUX_TERM "screen"
#endif
/* Minimum layout cell size, NOT including border lines. */ /* Minimum layout cell size, NOT including border lines. */
#define PANE_MINIMUM 1 #define PANE_MINIMUM 1