[Emacs-diffs] emacs-26 190565b: Support the new Japanese era name

[Eli Zaretskii]

branch: emacs-26
commit 190565b2396d80178fc5f6757117540e3a1ae9e1
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Support the new Japanese era name
    
    * admin/unidata/NormalizationTest.txt:
    * admin/unidata/UnicodeData.txt: Add U+32FF SQUARE ERA NAME REIWA.
    Do not merge to master.
    
    * test/lisp/international/ucs-normalize-tests.el
    (ucs-normalize-tests--failing-lines-part1)
    (ucs-normalize-tests--failing-lines-part2): Update.  Do not
    merge to master.
    
    * etc/NEWS: Mention the change.
---
 admin/unidata/NormalizationTest.txt            |  1 +
 admin/unidata/UnicodeData.txt                  |  1 +
 etc/NEWS                                       |  5 ++
 test/lisp/international/ucs-normalize-tests.el | 71 ++++++++++++--------------
 4 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/admin/unidata/NormalizationTest.txt 
b/admin/unidata/NormalizationTest.txt
index 72a31bc..6491402 100644
--- a/admin/unidata/NormalizationTest.txt
+++ b/admin/unidata/NormalizationTest.txt
@@ -2149,6 +2149,7 @@
 32FC;32FC;32FC;30F0;30F0; # (㋼; ㋼; ㋼; ヰ; ヰ; ) CIRCLED KATAKANA WI
 32FD;32FD;32FD;30F1;30F1; # (㋽; ㋽; ㋽; ヱ; ヱ; ) CIRCLED KATAKANA WE
 32FE;32FE;32FE;30F2;30F2; # (㋾; ㋾; ㋾; ヲ; ヲ; ) CIRCLED KATAKANA WO
+32FF;32FF;32FF;4EE4 548C;4EE4 548C; # (㋿; ㋿; ㋿; 令和; 令和; ) SQUARE ERA NAME REIWA
 3300;3300;3300;30A2 30D1 30FC 30C8;30A2 30CF 309A 30FC 30C8; # (㌀; ㌀; ㌀; アパート; 
アハ◌゚ート; ) SQUARE APAATO
 3301;3301;3301;30A2 30EB 30D5 30A1;30A2 30EB 30D5 30A1; # (㌁; ㌁; ㌁; アルファ; 
アルファ; ) SQUARE ARUHUA
 3302;3302;3302;30A2 30F3 30DA 30A2;30A2 30F3 30D8 309A 30A2; # (㌂; ㌂; ㌂; アンペア; 
アンヘ◌゚ア; ) SQUARE ANPEA
diff --git a/admin/unidata/UnicodeData.txt b/admin/unidata/UnicodeData.txt
index ec32faf..e33f9b3 100644
--- a/admin/unidata/UnicodeData.txt
+++ b/admin/unidata/UnicodeData.txt
@@ -11836,6 +11836,7 @@
 32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
 32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
 32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;;;;;
 3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
 3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
 3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
diff --git a/etc/NEWS b/etc/NEWS
index 1b66862..a4bc862 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -30,6 +30,11 @@ This allows disabling the new feature introduced in Emacs 
26.1 which
 loads files during completion of 'C-h f' and 'C-h v' according to
 'definition-prefixes'.
 
+---
+** Emacs now supports the new Japanese Era name.
+The newly assigned codepoint U+32FF was added to the Unicode Character
+Database compiled into Emacs.
+
 
 * Editing Changes in Emacs 26.3
 
diff --git a/test/lisp/international/ucs-normalize-tests.el 
b/test/lisp/international/ucs-normalize-tests.el
index d31aa5b..9f52003 100644
--- a/test/lisp/international/ucs-normalize-tests.el
+++ b/test/lisp/international/ucs-normalize-tests.el
@@ -181,26 +181,25 @@ implementations:
   (should-not (ucs-normalize-tests--rule1-failing-for-partX 0)))
 
 (defconst ucs-normalize-tests--failing-lines-part1
-  (list 15131 15132 15133 15134 15135 15136 15137 15138
-        15139
-        16149 16150 16151 16152 16153 16154 16155 16156
-        16157 16158 16159 16160 16161 16162 16163 16164
-        16165 16166 16167 16168 16169 16170 16171 16172
-        16173 16174 16175 16176 16177 16178 16179 16180
-        16181 16182 16183 16184 16185 16186 16187 16188
-        16189 16190 16191 16192 16193 16194 16195 16196
-        16197 16198 16199 16200 16201 16202 16203 16204
-        16205 16206 16207 16208 16209 16210 16211 16212
-        16213 16214 16215 16216 16217 16218 16219 16220
-        16221 16222 16223 16224 16225 16226 16227 16228
-        16229 16230 16231 16232 16233 16234 16235 16236
-        16237 16238 16239 16240 16241 16242 16243 16244
-        16245 16246 16247 16248 16249 16250 16251 16252
-        16253 16254 16255 16256 16257 16258 16259 16260
-        16261 16262 16263 16264 16265 16266 16267 16268
-        16269 16270 16271 16272 16273 16274 16275 16276
-        16277 16278 16279 16280 16281 16282 16283 16284
-        16285 16286 16287 16288 16289))
+  (list 2152 15132 15133 15134 15135 15136 15137 15138
+        15139 15140 16150 16151 16152 16153 16154 16155
+        16156 16157 16158 16159 16160 16161 16162 16163
+        16164 16165 16166 16167 16168 16169 16170 16171
+        16172 16173 16174 16175 16176 16177 16178 16179
+        16180 16181 16182 16183 16184 16185 16186 16187
+        16188 16189 16190 16191 16192 16193 16194 16195
+        16196 16197 16198 16199 16200 16201 16202 16203
+        16204 16205 16206 16207 16208 16209 16210 16211
+        16212 16213 16214 16215 16216 16217 16218 16219
+        16220 16221 16222 16223 16224 16225 16226 16227
+        16228 16229 16230 16231 16232 16233 16234 16235
+        16236 16237 16238 16239 16240 16241 16242 16243
+        16244 16245 16246 16247 16248 16249 16250 16251
+        16252 16253 16254 16255 16256 16257 16258 16259
+        16260 16261 16262 16263 16264 16265 16266 16267
+        16268 16269 16270 16271 16272 16273 16274 16275
+        16276 16277 16278 16279 16280 16281 16282 16283
+        16284 16285 16286 16287 16288 16289 16290))
 
 ;; Keep a record of failures, for consulting afterwards (the ert
 ;; backtrace only shows a truncated version of these lists).
@@ -258,23 +257,21 @@ implementations:
     ucs-normalize-tests--failing-lines-part1)))
 
 (defconst ucs-normalize-tests--failing-lines-part2
-  (list 17482 17532 17636 18338 18340 18342 18344 18346
-        18348 18350 18352 18354 18356 18358 18360 18362
-        18364 18366 18376 18378 18380 18382 18384 18386
-        18388 18390 18392 18394 18396 18398 18400 18402
-        18404 18406 18408 18410 18412 18414 18416 18418
-        18420 18422 18424 18426 18428 18430 18432 18434
-        18436 18438 18440 18442 18444 18446 18448 18450
-        18452 18454 18456 18458 18460 18462 18464 18466
-        18468 18470 18472 18474 18476 18478 18480 18482
-        18484 18486 18488 18490 18492 18494 18496 18564
-        18566 18568 18570 18572 18574 18576 18578 18580
-        18582 18584 18586 18588 18590 18592 18594 18596
-        18598 18600 18602 18604 18606 18608 18610 18612
-        18614 18616 18618 18620 18622 18624 18626 18628
-        18630 18632 18634 18636 18638 18640 18642 18644
-        18646 18648 18650 18652 18654 18656 18658 18660
-        18662 18664 18666))
+  (list 18377 18379 18381 18383 18385 18387 18389 18391
+        18393 18395 18397 18399 18401 18403 18405 18407
+        18409 18411 18413 18415 18417 18419 18421 18423
+        18425 18427 18429 18431 18433 18435 18437 18439
+        18441 18443 18445 18447 18449 18451 18453 18455
+        18457 18459 18461 18463 18465 18467 18469 18471
+        18473 18475 18477 18479 18481 18483 18485 18487
+        18489 18491 18493 18495 18497 18565 18567 18569
+        18571 18573 18575 18577 18579 18581 18583 18585
+        18587 18589 18591 18593 18595 18597 18599 18601
+        18603 18605 18607 18609 18611 18613 18615 18617
+        18619 18621 18623 18625 18627 18629 18631 18633
+        18635 18637 18639 18641 18643 18645 18647 18649
+        18651 18653 18655 18657 18659 18661 18663 18665
+        18667))
 
 (ert-deftest ucs-normalize-part2 ()
   :tags '(:expensive-test)