aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-08-09 15:26:24 +0000
committerTiago Cunha <tcunha@gmx.com>2009-08-09 15:26:24 +0000
commit15f6a41a753196bd59607f1ca0ea082608bbc3eb (patch)
treec1e0bf5354d9079c3218c474f1780df9ceaecbb8 /tmux.c
parent75b6736cf45d4b7b8b4873b4ad6d0cb85e56dcfb (diff)
downloadrtmux-15f6a41a753196bd59607f1ca0ea082608bbc3eb.tar.gz
rtmux-15f6a41a753196bd59607f1ca0ea082608bbc3eb.tar.bz2
rtmux-15f6a41a753196bd59607f1ca0ea082608bbc3eb.zip
Sync OpenBSD patchset 211:
Add a terminal-overrides session option allowing individual terminfo(5) entries to be overridden. The 88col/256col checks are now moved into the default setting and out of the code. Also remove a couple of old workarounds for xterm and rxvt which are no longer necessary (tmux can emulate them if missing).
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tmux.c b/tmux.c
index b867a6fd..5ccd5887 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.153 2009-07-30 20:32:05 tcunha Exp $ */
+/* $Id: tmux.c,v 1.154 2009-08-09 15:26:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -376,6 +376,8 @@ main(int argc, char **argv)
options_set_number(&global_s_options, "status-utf8", 1);
else
options_set_number(&global_s_options, "status-utf8", 0);
+ options_set_string(&global_s_options,
+ "terminal-overrides", "*88col*:colors=88,*256col*:colors=256");
options_set_number(&global_s_options, "visual-activity", 0);
options_set_number(&global_s_options, "visual-bell", 0);
options_set_number(&global_s_options, "visual-content", 0);