Merge from origin/emacs-27

e92b8e535a (origin/emacs-27) Remove raw carriage return characters fr...
5747a59a88 Recalculate default font when switching font backend
a2dd8c4234 * lisp/tab-line.el: Fix tab-line-format and tab-line-forma...
a7b8291b6c * etc/NEWS: Make the `--eval` example slightly more precise
f8254aad14 * lisp/image/image-converter.el: Support more ImageMagick ...
5beb269505 Support Unicode 13.0
3a671ad7ed Fix regression in wisent-total-conflicts

# Conflicts:
#	etc/NEWS

3 files changed, 33 insertions, 25 deletions

diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 6334c62a31c..56d1bdb110e 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -906,7 +906,7 @@ baz\"\""
     (electric-pair-local-mode 1)
     (insert-before-markers "int main () {}")
     (backward-char 1)
-    (let ((last-command-event ?
))
+    (let ((last-command-event ?\r))
       (call-interactively (key-binding `[,last-command-event])))
     (should (equal (buffer-string) "int main () {\n  \n}"))))
 
@@ -927,7 +927,7 @@ baz\"\""
                        '(after-stay))))))
     (insert "int main () {}")
     (backward-char 1)
-    (let ((last-command-event ?
))
+    (let ((last-command-event ?\r))
       (call-interactively (key-binding `[,last-command-event])))
     (should (equal (buffer-string) "int main () {\n  \n}"))))
 
@@ -948,7 +948,7 @@ baz\"\""
                        '(after-stay)))))
     (insert "int main () {}")
     (backward-char 1)
-    (let ((last-command-event ?
))
+    (let ((last-command-event ?\r))
       (call-interactively (key-binding `[,last-command-event])))
     (should (equal (buffer-string) "int main () {\n  \n}"))))
 
diff --git a/test/lisp/international/ucs-normalize-tests.el b/test/lisp/international/ucs-normalize-tests.el
index ec77e65271d..c36808ad72f 100644
--- a/test/lisp/international/ucs-normalize-tests.el
+++ b/test/lisp/international/ucs-normalize-tests.el
@@ -181,8 +181,8 @@ 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
+  (list 2152 2418 15133 15134 15135 15136 15137 15138
+        15139 15140 15141 15142 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
@@ -199,7 +199,9 @@ implementations:
         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 16366))
+        16284 16285 16286 16287 16288 16289 16290 16291
+        16292 16429 16430 16431 16432 16433 16434 16435
+        16436 16437 16438))
 
 ;; Keep a record of failures, for consulting afterwards (the ert
 ;; backtrace only shows a truncated version of these lists).
@@ -257,22 +259,28 @@ implementations:
     ucs-normalize-tests--failing-lines-part1)))
 
 (defconst ucs-normalize-tests--failing-lines-part2
-  (list 17689 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 18499 18501 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 18669 18671 18673 18675 18677 18679 18681
-        18683 18685 18687 18689 18691 18693))
+  (list 17634 17635 17646 17647 17652 17653 17656 17657
+        17660 17661 17672 17673 17750 17751 17832 17834
+        17836 17837 17862 17863 17868 17869 18222 18270
+        18271 18368 18370 18400 18401 18402 18404 18406
+        18408 18410 18412 18413 18414 18416 18417 18418
+        18420 18421 18422 18423 18424 18426 18427 18428
+        18429 18430 18432 18434 18436 18438 18440 18442
+        18444 18446 18448 18450 18452 18454 18456 18458
+        18459 18460 18462 18464 18465 18466 18468 18469
+        18470 18472 18474 18475 18476 18478 18480 18481
+        18482 18484 18486 18487 18488 18490 18492 18494
+        18496 18498 18499 18500 18502 18504 18506 18508
+        18510 18512 18514 18516 18518 18520 18522 18524
+        18526 18528 18530 18531 18532 18533 18534 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
+        18668 18670 18672 18674 18676 18678 18680 18682
+        18684 18686 18688 18690 18692 18694 18696 18698
+        18700 18702 18704 18706 18708 18710 18712 18714
+        18716 18718 18720 18722 18724 18726 18727))
 
 (ert-deftest ucs-normalize-part2 ()
   :tags '(:expensive-test)
diff --git a/test/manual/BidiCharacterTest.txt b/test/manual/BidiCharacterTest.txt
index 064594b98a2..02e2083ee66 100644
--- a/test/manual/BidiCharacterTest.txt
+++ b/test/manual/BidiCharacterTest.txt
@@ -1,6 +1,6 @@
-# BidiCharacterTest-12.0.0.txt
-# Date: 2018-11-02, 16:34:00 GMT [LI]
-# © 2018 Unicode®, Inc.
+# BidiCharacterTest-13.0.0.txt
+# Date: 2019-09-09, 19:32:00 GMT [LI]
+# © 2019 Unicode®, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database