Merge branch 'obsd-master' into master

2021-07-14 12:01:21 +01:00 · 2021-07-14 12:01:21 +01:00 · e3ff887d2a
parent 0ea6cdca90 732c72c98e
commit e3ff887d2a
2 changed files with 4 additions and 1 deletions
--- 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."
 	},

--- a/tmux.h
+++ b/tmux.h
@ -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