Skip to content

Commit c995a66

Browse files
brammooldouglaskayama
authored andcommitted
patch 7.4.752 Problem: Unicode 8.0 not supported. Solution: Update tables for Unicode 8.0. Avoid E36 when running the script. (James McCoy)
1 parent fcb0b2f commit c995a66

3 files changed

Lines changed: 35 additions & 6 deletions

File tree

runtime/tools/unicode.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ func! BuildWidthTable(pattern, tableName)
252252
endfunc
253253

254254

255+
" Try to avoid hitting E36
256+
set equalalways
255257

256258
" Edit the Unicode text file. Requires the netrw plugin.
257259
edit http://unicode.org/Public/UNIDATA/UnicodeData.txt

src/mbyte.c

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@ utf_iscomposing(c)
22662266
{0x0825, 0x0827},
22672267
{0x0829, 0x082d},
22682268
{0x0859, 0x085b},
2269-
{0x08e4, 0x0903},
2269+
{0x08e3, 0x0903},
22702270
{0x093a, 0x093c},
22712271
{0x093e, 0x094f},
22722272
{0x0951, 0x0957},
@@ -2366,8 +2366,6 @@ utf_iscomposing(c)
23662366
{0x18a9, 0x18a9},
23672367
{0x1920, 0x192b},
23682368
{0x1930, 0x193b},
2369-
{0x19b0, 0x19c0},
2370-
{0x19c8, 0x19c9},
23712369
{0x1a17, 0x1a1b},
23722370
{0x1a55, 0x1a5e},
23732371
{0x1a60, 0x1a7c},
@@ -2395,7 +2393,7 @@ utf_iscomposing(c)
23952393
{0x3099, 0x309a},
23962394
{0xa66f, 0xa672},
23972395
{0xa674, 0xa67d},
2398-
{0xa69f, 0xa69f},
2396+
{0xa69e, 0xa69f},
23992397
{0xa6f0, 0xa6f1},
24002398
{0xa802, 0xa802},
24012399
{0xa806, 0xa806},
@@ -2424,7 +2422,7 @@ utf_iscomposing(c)
24242422
{0xabec, 0xabed},
24252423
{0xfb1e, 0xfb1e},
24262424
{0xfe00, 0xfe0f},
2427-
{0xfe20, 0xfe2d},
2425+
{0xfe20, 0xfe2f},
24282426
{0x101fd, 0x101fd},
24292427
{0x102e0, 0x102e0},
24302428
{0x10376, 0x1037a},
@@ -2443,9 +2441,10 @@ utf_iscomposing(c)
24432441
{0x11173, 0x11173},
24442442
{0x11180, 0x11182},
24452443
{0x111b3, 0x111c0},
2444+
{0x111ca, 0x111cc},
24462445
{0x1122c, 0x11237},
24472446
{0x112df, 0x112ea},
2448-
{0x11301, 0x11303},
2447+
{0x11300, 0x11303},
24492448
{0x1133c, 0x1133c},
24502449
{0x1133e, 0x11344},
24512450
{0x11347, 0x11348},
@@ -2457,8 +2456,10 @@ utf_iscomposing(c)
24572456
{0x114b0, 0x114c3},
24582457
{0x115af, 0x115b5},
24592458
{0x115b8, 0x115c0},
2459+
{0x115dc, 0x115dd},
24602460
{0x11630, 0x11640},
24612461
{0x116ab, 0x116b7},
2462+
{0x1171d, 0x1172b},
24622463
{0x16af0, 0x16af4},
24632464
{0x16b30, 0x16b36},
24642465
{0x16f51, 0x16f7e},
@@ -2470,6 +2471,12 @@ utf_iscomposing(c)
24702471
{0x1d185, 0x1d18b},
24712472
{0x1d1aa, 0x1d1ad},
24722473
{0x1d242, 0x1d244},
2474+
{0x1da00, 0x1da36},
2475+
{0x1da3b, 0x1da6c},
2476+
{0x1da75, 0x1da75},
2477+
{0x1da84, 0x1da84},
2478+
{0x1da9b, 0x1da9f},
2479+
{0x1daa1, 0x1daaf},
24732480
{0x1e8d0, 0x1e8d6},
24742481
{0xe0100, 0xe01ef}
24752482
};
@@ -2742,6 +2749,7 @@ static convertStruct foldCase[] =
27422749
{0x531,0x556,1,48},
27432750
{0x10a0,0x10c5,1,7264},
27442751
{0x10c7,0x10cd,6,7264},
2752+
{0x13f8,0x13fd,1,-8},
27452753
{0x1e00,0x1e94,2,1},
27462754
{0x1e9b,0x1e9b,-1,-58},
27472755
{0x1e9e,0x1e9e,-1,-7615},
@@ -2809,8 +2817,13 @@ static convertStruct foldCase[] =
28092817
{0xa7ad,0xa7ad,-1,-42305},
28102818
{0xa7b0,0xa7b0,-1,-42258},
28112819
{0xa7b1,0xa7b1,-1,-42282},
2820+
{0xa7b2,0xa7b2,-1,-42261},
2821+
{0xa7b3,0xa7b3,-1,928},
2822+
{0xa7b4,0xa7b6,2,1},
2823+
{0xab70,0xabbf,1,-38864},
28122824
{0xff21,0xff3a,1,32},
28132825
{0x10400,0x10427,1,40},
2826+
{0x10c80,0x10cb2,1,64},
28142827
{0x118a0,0x118bf,1,32}
28152828
};
28162829

@@ -2952,6 +2965,8 @@ static convertStruct toLower[] =
29522965
{0x531,0x556,1,48},
29532966
{0x10a0,0x10c5,1,7264},
29542967
{0x10c7,0x10cd,6,7264},
2968+
{0x13a0,0x13ef,1,38864},
2969+
{0x13f0,0x13f5,1,8},
29552970
{0x1e00,0x1e94,2,1},
29562971
{0x1e9e,0x1e9e,-1,-7615},
29572972
{0x1ea0,0x1efe,2,1},
@@ -3017,8 +3032,12 @@ static convertStruct toLower[] =
30173032
{0xa7ad,0xa7ad,-1,-42305},
30183033
{0xa7b0,0xa7b0,-1,-42258},
30193034
{0xa7b1,0xa7b1,-1,-42282},
3035+
{0xa7b2,0xa7b2,-1,-42261},
3036+
{0xa7b3,0xa7b3,-1,928},
3037+
{0xa7b4,0xa7b6,2,1},
30203038
{0xff21,0xff3a,1,32},
30213039
{0x10400,0x10427,1,40},
3040+
{0x10c80,0x10cb2,1,64},
30223041
{0x118a0,0x118bf,1,32}
30233042
};
30243043

@@ -3098,6 +3117,7 @@ static convertStruct toUpper[] =
30983117
{0x28a,0x28b,1,-217},
30993118
{0x28c,0x28c,-1,-71},
31003119
{0x292,0x292,-1,-219},
3120+
{0x29d,0x29d,-1,42261},
31013121
{0x29e,0x29e,-1,42258},
31023122
{0x345,0x345,-1,84},
31033123
{0x371,0x373,2,-1},
@@ -3130,6 +3150,7 @@ static convertStruct toUpper[] =
31303150
{0x4cf,0x4cf,-1,-15},
31313151
{0x4d1,0x52f,2,-1},
31323152
{0x561,0x586,1,-48},
3153+
{0x13f8,0x13fd,1,-8},
31333154
{0x1d79,0x1d79,-1,35332},
31343155
{0x1d7d,0x1d7d,-1,3814},
31353156
{0x1e01,0x1e95,2,-1},
@@ -3183,8 +3204,12 @@ static convertStruct toUpper[] =
31833204
{0xa78c,0xa791,5,-1},
31843205
{0xa793,0xa797,4,-1},
31853206
{0xa799,0xa7a9,2,-1},
3207+
{0xa7b5,0xa7b7,2,-1},
3208+
{0xab53,0xab53,-1,-928},
3209+
{0xab70,0xabbf,1,-38864},
31863210
{0xff41,0xff5a,1,-32},
31873211
{0x10428,0x1044f,1,-40},
3212+
{0x10cc0,0x10cf2,1,-64},
31883213
{0x118c0,0x118df,1,-32}
31893214
};
31903215
/*

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,8 @@ static char *(features[]) =
756756

757757
static int included_patches[] =
758758
{ /* Add new patch number below this line */
759+
/**/
760+
752,
759761
/**/
760762
751,
761763
/**/

0 commit comments

Comments
 (0)