aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBasil L. Contovounesios2018-02-07 02:49:08 +0000
committerSimen Heggestøyl2018-02-07 22:14:00 +0100
commite209034536b11fbbba19f46a45f6afc316890a5d (patch)
tree99747aeecdea4c6a506e6b640924068878551ca5
parent5fe81923e5b6dbbfb623befa12a3317a7e934a63 (diff)
downloademacs-e209034536b11fbbba19f46a45f6afc316890a5d.tar.gz
emacs-e209034536b11fbbba19f46a45f6afc316890a5d.zip
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.
-rw-r--r--lisp/net/shr-color.el5
-rw-r--r--lisp/textmodes/css-mode.el2
-rw-r--r--test/lisp/textmodes/css-mode-tests.el2
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."
137 ("MediumAquaMarine" . "#66CDAA") 137 ("MediumAquaMarine" . "#66CDAA")
138 ("MediumBlue" . "#0000CD") 138 ("MediumBlue" . "#0000CD")
139 ("MediumOrchid" . "#BA55D3") 139 ("MediumOrchid" . "#BA55D3")
140 ("MediumPurple" . "#9370D8") 140 ("MediumPurple" . "#9370DB")
141 ("MediumSeaGreen" . "#3CB371") 141 ("MediumSeaGreen" . "#3CB371")
142 ("MediumSlateBlue" . "#7B68EE") 142 ("MediumSlateBlue" . "#7B68EE")
143 ("MediumSpringGreen" . "#00FA9A") 143 ("MediumSpringGreen" . "#00FA9A")
@@ -158,7 +158,7 @@ absolute value without any unit."
158 ("PaleGoldenRod" . "#EEE8AA") 158 ("PaleGoldenRod" . "#EEE8AA")
159 ("PaleGreen" . "#98FB98") 159 ("PaleGreen" . "#98FB98")
160 ("PaleTurquoise" . "#AFEEEE") 160 ("PaleTurquoise" . "#AFEEEE")
161 ("PaleVioletRed" . "#D87093") 161 ("PaleVioletRed" . "#DB7093")
162 ("PapayaWhip" . "#FFEFD5") 162 ("PapayaWhip" . "#FFEFD5")
163 ("PeachPuff" . "#FFDAB9") 163 ("PeachPuff" . "#FFDAB9")
164 ("Peru" . "#CD853F") 164 ("Peru" . "#CD853F")
@@ -166,6 +166,7 @@ absolute value without any unit."
166 ("Plum" . "#DDA0DD") 166 ("Plum" . "#DDA0DD")
167 ("PowderBlue" . "#B0E0E6") 167 ("PowderBlue" . "#B0E0E6")
168 ("Purple" . "#800080") 168 ("Purple" . "#800080")
169 ("RebeccaPurple" . "#663399")
169 ("Red" . "#FF0000") 170 ("Red" . "#FF0000")
170 ("RosyBrown" . "#BC8F8F") 171 ("RosyBrown" . "#BC8F8F")
171 ("RoyalBlue" . "#4169E1") 172 ("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.")
498 ("red" . "#ff0000") 498 ("red" . "#ff0000")
499 ("purple" . "#800080") 499 ("purple" . "#800080")
500 ("fuchsia" . "#ff00ff") 500 ("fuchsia" . "#ff00ff")
501 ("magenta" . "#ff00ff")
501 ("green" . "#008000") 502 ("green" . "#008000")
502 ("lime" . "#00ff00") 503 ("lime" . "#00ff00")
503 ("olive" . "#808000") 504 ("olive" . "#808000")
@@ -506,6 +507,7 @@ further value candidates, since that list would be infinite.")
506 ("blue" . "#0000ff") 507 ("blue" . "#0000ff")
507 ("teal" . "#008080") 508 ("teal" . "#008080")
508 ("aqua" . "#00ffff") 509 ("aqua" . "#00ffff")
510 ("cyan" . "#00ffff")
509 ("orange" . "#ffa500") 511 ("orange" . "#ffa500")
510 ("aliceblue" . "#f0f8ff") 512 ("aliceblue" . "#f0f8ff")
511 ("antiquewhite" . "#faebd7") 513 ("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 @@
58 58
59 ;; Check that the `color' property doesn't cause infinite recursion 59 ;; Check that the `color' property doesn't cause infinite recursion
60 ;; because it refers to the value class of the same name. 60 ;; because it refers to the value class of the same name.
61 (should (= (length (css--property-values "color")) 152))) 61 (should (= (length (css--property-values "color")) 154)))
62 62
63(ert-deftest css-test-property-value-cache () 63(ert-deftest css-test-property-value-cache ()
64 "Test that `css--property-value-cache' is in use." 64 "Test that `css--property-value-cache' is in use."