Merge branch 'obsd-master'

Conflicts:
	tmux.1
	window.c

1 files changed, 2 insertions, 1 deletions

diff --git a/screen.c b/screen.c
index 087611ae..ebd117a0 100644
--- a/screen.c
+++ b/screen.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <vis.h>
 
 #include "tmux.h"
 
@@ -107,7 +108,7 @@ void
 screen_set_title(struct screen *s, const char *title)
 {
 	free(s->title);
-	s->title = xstrdup(title);
+	utf8_stravis(&s->title, title, VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL);
 }
 
 /* Resize screen. */