Index: src/main/character.c
===================================================================
--- src/main/character.c	(revision 78116)
+++ src/main/character.c	(working copy)
@@ -180,10 +180,7 @@
 		int nc = 0;
 		for( ; *p; p += utf8clen(*p)) {
 		    utf8toucs(&wc1, p);
-		    if (IS_HIGH_SURROGATE(wc1))
-		    	ucs = utf8toucs32(wc1, p);
-		    else
-		    	ucs = wc1;
+                    ucs = wc1;
 		    nc += Ri18n_wcwidth(ucs);
 		}
 		return nc;