From e209034536b11fbbba19f46a45f6afc316890a5d Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Wed, 7 Feb 2018 02:49:08 +0000 Subject: [PATCH] Fix shr and CSS 4 color maps * lisp/net/shr-color.el (shr-color-html-colors-alist): Fix typos. Add RebeccaPurple. * lisp/textmodes/css-mode.el (css--color-map): Add fuchsia-magenta and aqua-cyan aliases. * test/lisp/textmodes/css-mode-tests.el (css-test-property-values): Bump color count. --- lisp/net/shr-color.el | 5 +++-- lisp/textmodes/css-mode.el | 2 ++ test/lisp/textmodes/css-mode-tests.el | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el index 60d44b3cd66..ca7d1ce55a4 100644 --- a/lisp/net/shr-color.el +++ b/lisp/net/shr-color.el @@ -137,7 +137,7 @@ absolute value without any unit." ("MediumAquaMarine" . "#66CDAA") ("MediumBlue" . "#0000CD") ("MediumOrchid" . "#BA55D3") - ("MediumPurple" . "#9370D8") + ("MediumPurple" . "#9370DB") ("MediumSeaGreen" . "#3CB371") ("MediumSlateBlue" . "#7B68EE") ("MediumSpringGreen" . "#00FA9A") @@ -158,7 +158,7 @@ absolute value without any unit." ("PaleGoldenRod" . "#EEE8AA") ("PaleGreen" . "#98FB98") ("PaleTurquoise" . "#AFEEEE") - ("PaleVioletRed" . "#D87093") + ("PaleVioletRed" . "#DB7093") ("PapayaWhip" . "#FFEFD5") ("PeachPuff" . "#FFDAB9") ("Peru" . "#CD853F") @@ -166,6 +166,7 @@ absolute value without any unit." ("Plum" . "#DDA0DD") ("PowderBlue" . "#B0E0E6") ("Purple" . "#800080") + ("RebeccaPurple" . "#663399") ("Red" . "#FF0000") ("RosyBrown" . "#BC8F8F") ("RoyalBlue" . "#4169E1") diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 922c1bfe13e..febf7c66139 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -498,6 +498,7 @@ further value candidates, since that list would be infinite.") ("red" . "#ff0000") ("purple" . "#800080") ("fuchsia" . "#ff00ff") + ("magenta" . "#ff00ff") ("green" . "#008000") ("lime" . "#00ff00") ("olive" . "#808000") @@ -506,6 +507,7 @@ further value candidates, since that list would be infinite.") ("blue" . "#0000ff") ("teal" . "#008080") ("aqua" . "#00ffff") + ("cyan" . "#00ffff") ("orange" . "#ffa500") ("aliceblue" . "#f0f8ff") ("antiquewhite" . "#faebd7") diff --git a/test/lisp/textmodes/css-mode-tests.el b/test/lisp/textmodes/css-mode-tests.el index 04a13e38240..d4fb348326a 100644 --- a/test/lisp/textmodes/css-mode-tests.el +++ b/test/lisp/textmodes/css-mode-tests.el @@ -58,7 +58,7 @@ ;; Check that the `color' property doesn't cause infinite recursion ;; because it refers to the value class of the same name. - (should (= (length (css--property-values "color")) 152))) + (should (= (length (css--property-values "color")) 154))) (ert-deftest css-test-property-value-cache () "Test that `css--property-value-cache' is in use." -- 2.39.2