Merge branch 'master' of ssh://suckless.org/gitrepos/st - st

commit 0c94f8621b738c51c9e08abc3c52fe8dfe24b953
parent 0d838b72437c6cac0d87366352939fdb86c2b697
Author: Christoph Lohmann <20h@r-36.net>
Date:   Sun, 30 Aug 2015 11:29:23 +0200

Merge branch 'master' of ssh://suckless.org/gitrepos/st

Diffstat:
M st.c  | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/st.c b/st.c
@@ -2896,15 +2896,15 @@ tputc(Rune u)
     int width, len;
     Glyph *gp;
 
+    control = ISCONTROL(u);
     len = utf8encode(u, c);
-    if ((width = wcwidth(u)) == -1) {
+    if (!control && (width = wcwidth(u)) == -1) {
         memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
         width = 1;
     }
 
     if (IS_SET(MODE_PRINT))
         tprinter(c, len);
-    control = ISCONTROL(u);
 
     /*
      * STR sequence must be checked before anything else