diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-07-14 12:01:21 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-07-14 12:01:21 +0100 |
| commit | e3ff887d2ac846afee4f25359ced420ab2f3faf6 (patch) | |
| tree | ad37caf96ecae9bc5d878068074bdf702b940663 | |
| parent | 0ea6cdca9051461658ba390bbc7298c02bbb1aad (diff) | |
| parent | 732c72c98e9b3aa6b1d33f1eab9fa16874d92e7d (diff) | |
| download | rtmux-e3ff887d2ac846afee4f25359ced420ab2f3faf6.tar.gz rtmux-e3ff887d2ac846afee4f25359ced420ab2f3faf6.tar.bz2 rtmux-e3ff887d2ac846afee4f25359ced420ab2f3faf6.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | options-table.c | 2 | ||||
| -rw-r--r-- | tmux.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/options-table.c b/options-table.c index 2555147a..724f3af0 100644 --- a/options-table.c +++ b/options-table.c @@ -233,7 +233,7 @@ const struct options_table_entry options_table[] = { { .name = "default-terminal", .type = OPTIONS_TABLE_STRING, .scope = OPTIONS_TABLE_SERVER, - .default_str = "screen", + .default_str = TMUX_TERM, .text = "Default for the 'TERM' environment variable." }, @@ -75,6 +75,9 @@ struct winlink; #ifndef TMUX_SOCK #define TMUX_SOCK "$TMUX_TMPDIR:" _PATH_TMP #endif +#ifndef TMUX_TERM +#define TMUX_TERM "screen" +#endif /* Minimum layout cell size, NOT including border lines. */ #define PANE_MINIMUM 1 |