Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-10-25 16:01:22 +01:00
commit 0072bc65e6
2 changed files with 2 additions and 2 deletions

View File

@ -547,7 +547,7 @@ const struct options_table_entry options_table[] = {
{ .name = "allow-rename", { .name = "allow-rename",
.type = OPTIONS_TABLE_FLAG, .type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_WINDOW, .scope = OPTIONS_TABLE_WINDOW,
.default_num = 1 .default_num = 0
}, },
{ .name = "alternate-screen", { .name = "alternate-screen",

2
tmux.1
View File

@ -3023,7 +3023,7 @@ and poor for interactive programs such as shells.
.Xc .Xc
Allow programs to change the window name using a terminal escape Allow programs to change the window name using a terminal escape
sequence (\eek...\ee\e\e). sequence (\eek...\ee\e\e).
The default is on. The default is off.
.Pp .Pp
.It Xo Ic alternate-screen .It Xo Ic alternate-screen
.Op Ic on | off .Op Ic on | off