aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-10-25 16:01:22 +0100
committerThomas Adam <thomas@xteddy.org>2017-10-25 16:01:22 +0100
commit0072bc65e61ac2be284fab2c9afafc62a92e6c75 (patch)
tree1c9fff908b581e4f2595ac642219d7044098ccd0
parent37f83adca8b965133ebdaeebea790ae897bd7175 (diff)
parent578a63bbc9ac29378f844827fc393e21ae6cb6b6 (diff)
downloadrtmux-0072bc65e61ac2be284fab2c9afafc62a92e6c75.tar.gz
rtmux-0072bc65e61ac2be284fab2c9afafc62a92e6c75.tar.bz2
rtmux-0072bc65e61ac2be284fab2c9afafc62a92e6c75.zip
Merge branch 'obsd-master'
-rw-r--r--options-table.c2
-rw-r--r--tmux.12
2 files changed, 2 insertions, 2 deletions
diff --git a/options-table.c b/options-table.c
index f5e973e5..c9a69271 100644
--- a/options-table.c
+++ b/options-table.c
@@ -547,7 +547,7 @@ const struct options_table_entry options_table[] = {
{ .name = "allow-rename",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_WINDOW,
- .default_num = 1
+ .default_num = 0
},
{ .name = "alternate-screen",
diff --git a/tmux.1 b/tmux.1
index aa9801a8..0c760b10 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3023,7 +3023,7 @@ and poor for interactive programs such as shells.
.Xc
Allow programs to change the window name using a terminal escape
sequence (\eek...\ee\e\e).
-The default is on.
+The default is off.
.Pp
.It Xo Ic alternate-screen
.Op Ic on | off