diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-16 20:38:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-16 20:38:57 (GMT) |
| commit | 9fd911a8101bf4d3bff4e2e61a138505eb39eace (patch) | |
| tree | cc7d91f75286108023859ccde900e82806499881 /utf8.c | |
| parent | 51bb8adbc9d59ae042eb9134e5218240a1532bea (diff) | |
| parent | d813ab970db8b57b70bdd1b7e5feddec1c3fd84e (diff) | |
| download | git-9fd911a8101bf4d3bff4e2e61a138505eb39eace.zip git-9fd911a8101bf4d3bff4e2e61a138505eb39eace.tar.gz git-9fd911a8101bf4d3bff4e2e61a138505eb39eace.tar.bz2 | |
Merge branch 'tb/unicode-6.3-zero-width'
Teach our display-column-counting logic about decomposed umlauts
and friends.
* tb/unicode-6.3-zero-width:
utf8.c: partially update to version 6.3
Diffstat (limited to 'utf8.c')
| -rw-r--r-- | utf8.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -84,11 +84,10 @@ static int git_wcwidth(ucs_char_t ch) * "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c". */ static const struct interval combining[] = { - { 0x0300, 0x0357 }, { 0x035D, 0x036F }, { 0x0483, 0x0486 }, - { 0x0488, 0x0489 }, { 0x0591, 0x05A1 }, { 0x05A3, 0x05B9 }, - { 0x05BB, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C4 }, { 0x0600, 0x0603 }, { 0x0610, 0x0615 }, - { 0x064B, 0x0658 }, { 0x0670, 0x0670 }, { 0x06D6, 0x06E4 }, + { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD }, + { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, + { 0x05C7, 0x05C7 }, { 0x0600, 0x0604 }, { 0x0610, 0x061A }, + { 0x064B, 0x065F }, { 0x0670, 0x0670 }, { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x0901, 0x0902 }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, |