summaryrefslogtreecommitdiffstats
path: root/cmd-string.c
authortcunha <tcunha>2009-08-09 15:26:24 (GMT)
committer tcunha <tcunha>2009-08-09 15:26:24 (GMT)
commitf7ced722153b4ca5f39228cf952df827a99f1c29 (patch) (side-by-side diff)
treecdb8a44c59bd0ff709b1db31cb1877df08f24ee8 /cmd-string.c
parentb640845dec0ec197a99193276cce32619230041b (diff)
downloadtmux-old-f7ced722153b4ca5f39228cf952df827a99f1c29.zip
tmux-old-f7ced722153b4ca5f39228cf952df827a99f1c29.tar.gz
tmux-old-f7ced722153b4ca5f39228cf952df827a99f1c29.tar.bz2
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 'cmd-string.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cmd-string.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-string.c b/cmd-string.c
index 818e25e..eabc338 100644
--- a/cmd-string.c
+++ b/cmd-string.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cmd-string.c,v 1.22 2009/08/09 15:26:24 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <[email protected]>
@@ -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;