---

yaml
---
r: 10550
b: refs/heads/snap-stage3
c: 21d56f2
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 015527b0cee0bc5cfaac8dd610035a0c1b2f8ea6
+refs/heads/snap-stage3: 21d56f2c68bf54e52611db486f900e93d1d2a349
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/libcore/extfmt.rs

@@ -94,7 +94,8 @@ mod ct {
         }
         let mut i = 0u;
         while i < lim {
-            let curr = str::slice(s, i, i+1u);
+            let size = str::utf8_char_width(s[i]);
+            let curr = str::slice(s, i, i+size);
             if str::eq(curr, "%") {
                 i += 1u;
                 if i >= lim {
@@ -110,7 +111,7 @@ mod ct {
                     pieces += [rs.piece];
                     i = rs.next;
                 }
-            } else { buf += curr; i += 1u; }
+            } else { buf += curr; i += size; }
         }
         flush_buf(buf, pieces);
         ret pieces;