Merge from origin/emacs-26

96aaeaaffa ; * src/lcms.c: Minor stylistic changes in comments.
c3df816585 Fix compilation warning in etags.c
5490ccc5eb Add lisp variable lcms-d65-xyz
dee96f4a17 * lisp/emacs-lisp/cl-macs.el (cl-letf): Fix Edebug spec (b...
12e864eb30 Avoid MinGW64 compiler warnings in unexw32.c
625cee5316 Start emacs-26 release branch

# Conflicts:
#	README
#	configure.ac
#	msdos/sed2v2.inp
#	nt/README.W32

diff --cc test/src/lcms-tests.el
index 74648e1979e8c553994cd8f2adb2d58213e8b4fd,e176cff2dc6d8f88a7ea7b151f9cf76631424bd6..962902eb10038af3759635c6a17385f966a015a3
--- 1/test/src/lcms-tests.el
--- 2/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@@ -46,9 -49,24 +49,25 @@@ B is considered the exact value.
          (lcms-approx-p a2 b2 delta)
          (lcms-approx-p a3 b3 delta))))
  
+ (ert-deftest lcms-cri-cam02-ucs ()
+   "Test use of `lcms-cam02-ucs'."
+   (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error"))
+   (should-error (lcms-cam02-ucs '(0 0 0) 'error))
+   (should-not
+    (lcms-approx-p
+     (let ((lcms-d65-xyz '(0.44757 1.0 0.40745)))
+       (lcms-cam02-ucs '(0.5 0.5 0.5) '(0 0 0)))
+     (lcms-cam02-ucs '(0.5 0.5 0.5) '(0 0 0))))
+   (should (eql 0.0 (lcms-cam02-ucs '(0.5 0.5 0.5) '(0.5 0.5 0.5))))
+   (should
+    (lcms-approx-p (lcms-cam02-ucs lcms-colorspacious-d65
+                                   '(0 0 0)
+                                   lcms-colorspacious-d65)
+                   100.0)))
+ 
  (ert-deftest lcms-whitepoint ()
    "Test use of `lcms-temp->white-point'."
 +  (skip-unless (featurep 'lcms2))
    (should-error (lcms-temp->white-point 3999))
    (should-error (lcms-temp->white-point 25001))
    ;; D55