aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-19 22:31:27 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-19 22:31:27 +0000
commit8512811535658a49ed738904233c9289e152a042 (patch)
treed43f0336b2748d76b73882f85409eb44b49a4f5b
parent224ae13ab05248eb7513583aa6cfa9d823499fc9 (diff)
downloadrtmux-8512811535658a49ed738904233c9289e152a042.tar.gz
rtmux-8512811535658a49ed738904233c9289e152a042.tar.bz2
rtmux-8512811535658a49ed738904233c9289e152a042.zip
Sync OpenBSD patchset 551:
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.
-rw-r--r--tmux.14
-rw-r--r--tmux.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/tmux.1 b/tmux.1
index 38b11e2f..5a3816c0 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.204 2009-11-19 22:25:52 tcunha Exp $
+.\" $Id: tmux.1,v 1.205 2009-11-19 22:31:27 tcunha 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/tmux.c b/tmux.c
index 1e459276..bc91c562 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.189 2009-11-19 22:20:04 tcunha Exp $ */
+/* $Id: tmux.c,v 1.190 2009-11-19 22:31:27 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -394,7 +394,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);