Merge branch 'obsd-master'

2017-10-25 16:01:22 +01:00 · 2017-10-25 16:01:22 +01:00 · 0072bc65e6
parent 37f83adca8 578a63bbc9
commit 0072bc65e6
2 changed files with 2 additions and 2 deletions
--- 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",
--- 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