iMerge branch 'master' of ssh://suckless.org/gitrepos/st - st - Simple Terminal	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
1Log	/scm/st//log.gph	gopher.r-36.net	70
1Files	/scm/st//files.gph	gopher.r-36.net	70
1Refs	/scm/st//refs.gph	gopher.r-36.net	70
1README	/scm/st//file/README.gph	gopher.r-36.net	70
1LICENSE	/scm/st//file/LICENSE.gph	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1commit 0c94f8621b738c51c9e08abc3c52fe8dfe24b953	/scm/st//commit/0c94f8621b738c51c9e08abc3c52fe8dfe24b953.gph	gopher.r-36.net	70
1parent 0d838b72437c6cac0d87366352939fdb86c2b697	/scm/st//commit/0d838b72437c6cac0d87366352939fdb86c2b697.gph	gopher.r-36.net	70
hAuthor: Christoph Lohmann <20h@r-36.net>	URL:mailto:20h@r-36.net	gopher.r-36.net	70
iDate:   Sun, 30 Aug 2015 11:29:23 +0200	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iMerge branch 'master' of ssh://suckless.org/gitrepos/st	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iDiffstat:	Err	gopher.r-36.net	70
i  st.c                                |       4 ++--	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
i1 file changed, 2 insertions(+), 2 deletions(-)	Err	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1diff --git a/st.c b/st.c	/scm/st//file/st.c.gph	gopher.r-36.net	70
i@@ -2896,15 +2896,15 @@ tputc(Rune u)	Err	gopher.r-36.net	70
i         int width, len;	Err	gopher.r-36.net	70
i         Glyph *gp;	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i+        control = ISCONTROL(u);	Err	gopher.r-36.net	70
i         len = utf8encode(u, c);	Err	gopher.r-36.net	70
i-        if ((width = wcwidth(u)) == -1) {	Err	gopher.r-36.net	70
i+        if (!control && (width = wcwidth(u)) == -1) {	Err	gopher.r-36.net	70
i                 memcpy(c, "\357\277\275", 4); /* UTF_INVALID */	Err	gopher.r-36.net	70
i                 width = 1;	Err	gopher.r-36.net	70
i         }	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         if (IS_SET(MODE_PRINT))	Err	gopher.r-36.net	70
i                 tprinter(c, len);	Err	gopher.r-36.net	70
i-        control = ISCONTROL(u);	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         /*	Err	gopher.r-36.net	70
i          * STR sequence must be checked before anything else	Err	gopher.r-36.net	70
.