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).
This commit is contained in:
Tiago Cunha
2009-08-09 15:26:24 +00:00
parent 75b6736cf4
commit 15f6a41a75
8 changed files with 107 additions and 37 deletions

View File

@ -1,4 +1,4 @@
/* $Id: cmd-string.c,v 1.21 2009-07-14 06:54:38 nicm Exp $ */
/* $Id: cmd-string.c,v 1.22 2009-08-09 15:26:24 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -215,6 +215,9 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc)
switch (ch = cmd_string_getc(s, p)) {
case EOF:
goto error;
case 'e':
ch = '\033';
break;
case 'r':
ch = '\r';
break;