summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-11-19 14:06:35 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-11-19 14:06:35 +0000
commit3b78243fffd5d4b1cd72a8bac1b23f47e4ff88d8 (patch)
tree75c28ccd252625b91e9974d5f9d8a9e2b88c2164 /usr.bin/tmux
parentaca93aee7160605018e505ebcd717eee9f491fd5 (diff)
Revert to xterm-keys off by default. It was on as an experiment to see if the
option could be removed, but it affects vi, so we have to keep the option, and a conservative default is better.
Diffstat (limited to 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/tmux.14
-rw-r--r--usr.bin/tmux/tmux.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 3eed1f0134e..9442cfc6521 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.122 2009/11/19 10:22:07 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.123 2009/11/19 14:06:33 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -1803,7 +1803,7 @@ will generate
.Xr xterm 1 -style
function key sequences; these have a number included to indicate modifiers such
as Shift, Alt or Ctrl.
-The default is on.
+The default is off.
.El
.It Xo Ic show-options
.Op Fl g
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index d9872a72d54..b2cd6806a71 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.58 2009/11/18 13:16:33 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.59 2009/11/19 14:06:34 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -391,7 +391,7 @@ main(int argc, char **argv)
options_set_number(wo, "window-status-current-bg", 8);
options_set_number(wo, "window-status-current-fg", 8);
options_set_number(wo, "window-status-fg", 8);
- options_set_number(wo, "xterm-keys", 1);
+ options_set_number(wo, "xterm-keys", 0);
options_set_number(wo, "remain-on-exit", 0);
options_set_number(wo, "synchronize-panes", 0);