Merge from emacs-26

3434edc731 Enlarge DUMPED_HEAP_SIZE for 64-bit Windows builds
36bbdfc017 Update Unicode data files to version 11.0.0 of Unicode
b7b7a5f4f3 * etc/NEWS: Belatedly call out vc-hg changes in v26.1.  (B...
5b6f8b54d1 Clarify the documentation of 'dired-recursive-deletes'
9db97b49cd ; * etc/DEBUG: Add information about debugging libXft prob...
0214ffbe60 Clarify doc string of 'update-glyphless-char-display'
ef35d405b1 Clarify subtle issues with 'eq' in byte-compiled code
c6ef3c8321 Make cl-print respect print-quoted (bug#31649)
26b52ac40e Fix unexpected jumps of window-point in 'set-window-config...
4af077ab4d * etc/emacs.appdata.xml: Update Emacs screenshot.
e5ab25deae Fix cursor movement by 'next-logical-line' after 'next-line'
d20beef5f1 Fix prompt in bookmark.el (Bug#24726)
c57e7eaae8 Improve documentation of 'empty' whitespace-style

# Conflicts:
#	etc/NEWS

3 files changed, 30 insertions, 18 deletions

diff --git a/test/lisp/emacs-lisp/cl-print-tests.el b/test/lisp/emacs-lisp/cl-print-tests.el
index bfce4a16cec..404d323d0c1 100644
--- a/test/lisp/emacs-lisp/cl-print-tests.el
+++ b/test/lisp/emacs-lisp/cl-print-tests.el
@@ -72,6 +72,16 @@
     (should (equal "#s(cl-print-tests-struct :a (a (b (c ...))) :b nil :c nil :d nil :e nil)"
                    (cl-prin1-to-string deep-struct)))))
 
+(ert-deftest cl-print-tests-5 ()
+  "CL printing observes `print-quoted'."
+  (let ((quoted-stuff '('a #'b `(,c ,@d))))
+    (let ((print-quoted t))
+      (should (equal "('a #'b `(,c ,@d))"
+                     (cl-prin1-to-string quoted-stuff))))
+    (let ((print-quoted nil))
+      (should (equal "((quote a) (function b) (\\` ((\\, c) (\\,@ d))))"
+                     (cl-prin1-to-string quoted-stuff))))))
+
 (ert-deftest cl-print-circle ()
   (let ((x '(#1=(a . #1#) #1#)))
     (let ((print-circle nil))
diff --git a/test/lisp/international/ucs-normalize-tests.el b/test/lisp/international/ucs-normalize-tests.el
index 012ae4824c4..1a1cc7519b2 100644
--- a/test/lisp/international/ucs-normalize-tests.el
+++ b/test/lisp/international/ucs-normalize-tests.el
@@ -258,21 +258,23 @@ implementations:
     ucs-normalize-tests--failing-lines-part1)))
 
 (defconst ucs-normalize-tests--failing-lines-part2
-  (list 17656 17658 18006 18007 18008 18009 18010 18011
-        18012 18340 18342 18344 18346 18348 18350 18352
-        18354 18356 18358 18360 18362 18364 18366 18368
-        18370 18372 18374 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 18518 18520 18522 18524 18526 18528 18530
-        18532 18534 18536 18538 18540 18542 18544 18546
-        18548 18550 18552 18554 18556 18558 18560 18562
-        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))
+  (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))
 
 (ert-deftest ucs-normalize-part2 ()
   :tags '(:expensive-test)
diff --git a/test/manual/BidiCharacterTest.txt b/test/manual/BidiCharacterTest.txt
index a3d2b46cc40..6a0df6dfb6d 100644
--- a/test/manual/BidiCharacterTest.txt
+++ b/test/manual/BidiCharacterTest.txt
@@ -1,6 +1,6 @@
-# BidiCharacterTest-10.0.0.txt
-# Date: 2017-03-09, 00:30:00 GMT [LI]
-# © 2017 Unicode®, Inc.
+# BidiCharacterTest-11.0.0.txt
+# Date: 2018-02-18, 05:50:00 GMT [LI]
+# © 2018 Unicode®, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database