diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-02-09 11:12:48 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-02-09 11:12:48 -0800 |
| commit | 875cb835f00260d58c536b3a3f7c0343fd5f28dc (patch) | |
| tree | 4f59af87328e8d4d69667b3b35c42f795e7d3d29 /lisp/textmodes/css-mode.el | |
| parent | 05e8b4392be7fb368dcf4e4a19f75f94b323028d (diff) | |
| parent | 0276743672672ce0caec7861741293a4ae11cb52 (diff) | |
| download | emacs-875cb835f00260d58c536b3a3f7c0343fd5f28dc.tar.gz | |
Merge from origin/emacs-26
0276743 (origin/emacs-26) Doc string fix in latin-alt.el
c9269af Minor improvements in package.texi
898a3e4 Minor improvement in Emacs user manual
8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3.
989d0af Improve documentation of mini-window resizing
923e415 More changes in the Emacs manual
565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24...
2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350)
19fa6d5 Fix --no-build-details for w32 and macOS
979944c * doc/lispref/anti.texi (Antinews): Add some more antinews.
c2727e3 Fix crashes when run with --no-build-details
dc08490 More changes for the manual
04c5bd5 Doc fixes for process functions (Bug#30349)
e209034 Fix shr and CSS 4 color maps
5fe8192 Yet another round of improvements in the manual
Conflicts:
doc/emacs/files.texi
test/lisp/subr-tests.el
Diffstat (limited to 'lisp/textmodes/css-mode.el')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 55c21f8acb0..727bc18ebb8 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -499,6 +499,7 @@ further value candidates, since that list would be infinite.") ("red" . "#ff0000") ("purple" . "#800080") ("fuchsia" . "#ff00ff") + ("magenta" . "#ff00ff") ("green" . "#008000") ("lime" . "#00ff00") ("olive" . "#808000") @@ -507,6 +508,7 @@ further value candidates, since that list would be infinite.") ("blue" . "#0000ff") ("teal" . "#008080") ("aqua" . "#00ffff") + ("cyan" . "#00ffff") ("orange" . "#ffa500") ("aliceblue" . "#f0f8ff") ("antiquewhite" . "#faebd7") |