summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2021-07-14 08:56:01 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2021-07-14 08:56:01 +0000
commitcc425e462596a2b5b2468e9c4f2aa2122668999a (patch)
tree57f25dc70642a0c44798c2b042a599001c6cb618
parent46632946f931cb40e8d5a1f05fc67106c566c6a4 (diff)
Move default value for TERM into tmux.h.
-rw-r--r--usr.bin/tmux/options-table.c4
-rw-r--r--usr.bin/tmux/tmux.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index d3d1fc40e76..52c64ea774c 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.144 2021/06/16 11:57:04 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.145 2021/07/14 08:56:00 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -234,7 +234,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."
},
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 765dc37821f..18ec5747268 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1110 2021/06/10 07:56:47 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1111 2021/07/14 08:56:00 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -74,6 +74,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