aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-06-04 12:15:51 -0400
committerChong Yidong2010-06-04 12:15:51 -0400
commit86253dc05d5fd22d837806b4deecedbe8f5f09c6 (patch)
tree8c12c4c84803ef460b66bc21c17aedc5a54c8d9c
parentf07b083d4a3a262ee8724f9bead86f5ed7be5d7e (diff)
downloademacs-86253dc05d5fd22d837806b4deecedbe8f5f09c6.tar.gz
emacs-86253dc05d5fd22d837806b4deecedbe8f5f09c6.zip
* term/common-win.el (x-colors): Add "dark green" and "dark turquoise" (Bug#6332).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/common-win.el9
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aafa464461d..8a10343171a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-06-04 Chong Yidong <cyd@stupidchicken.com>
2
3 * term/common-win.el (x-colors): Add "dark green" and "dark
4 turquoise" (Bug#6332).
5
12010-06-03 Eric Ludlam <zappo@gnu.org> 62010-06-03 Eric Ludlam <zappo@gnu.org>
2 7
3 * cedet/semantic/lex-spp.el 8 * cedet/semantic/lex-spp.el
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index c3c5f8e302c..ccdd47be470 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -275,10 +275,11 @@ This function returns ARGS minus the arguments that have been processed."
275 "medium slate blue" "slate blue" "dark slate blue" "midnight blue" "navy" 275 "medium slate blue" "slate blue" "dark slate blue" "midnight blue" "navy"
276 "dark blue" "light steel blue" "cornflower blue" "dodger blue" "royal blue" 276 "dark blue" "light steel blue" "cornflower blue" "dodger blue" "royal blue"
277 "light slate gray" "slate gray" "dark slate gray" "steel blue" "cadet blue" 277 "light slate gray" "slate gray" "dark slate gray" "steel blue" "cadet blue"
278 "light sky blue" "sky blue" "light blue" "powder blue" "pale turquoise" "turquoise" 278 "light sky blue" "sky blue" "light blue" "powder blue" "pale turquoise"
279 "medium turquoise" "dark cyan" "aquamarine" "medium aquamarine" "light sea green" 279 "turquoise" "medium turquoise" "dark turquoise" "dark cyan" "aquamarine"
280 "medium aquamarine" "light sea green"
280 "medium sea green" "sea green" "dark sea green" "pale green" "lime green" 281 "medium sea green" "sea green" "dark sea green" "pale green" "lime green"
281 "forest green" "light green" "green yellow" "yellow green" "olive drab" 282 "dark green" "forest green" "light green" "green yellow" "yellow green" "olive drab"
282 "dark olive green" "lemon chiffon" "khaki" "dark khaki" "cornsilk" 283 "dark olive green" "lemon chiffon" "khaki" "dark khaki" "cornsilk"
283 "pale goldenrod" "light goldenrod" "goldenrod" "dark goldenrod" "wheat" 284 "pale goldenrod" "light goldenrod" "goldenrod" "dark goldenrod" "wheat"
284 "navajo white" "tan" "burlywood" "sandy brown" "peru" "chocolate" "saddle brown" 285 "navajo white" "tan" "burlywood" "sandy brown" "peru" "chocolate" "saddle brown"
@@ -287,7 +288,7 @@ This function returns ARGS minus the arguments that have been processed."
287 "dark magenta" "dark violet" "medium blue" "blue" "deep sky blue" 288 "dark magenta" "dark violet" "medium blue" "blue" "deep sky blue"
288 "cyan" "medium spring green" "spring green" "green" "lawn green" "chartreuse" 289 "cyan" "medium spring green" "spring green" "green" "lawn green" "chartreuse"
289 "yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white smoke" 290 "yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white smoke"
290 "gainsboro" "light grey" "gray" "dark grey" "dim gray" "black" )) 291 "gainsboro" "light gray" "gray" "dark gray" "dim gray" "black" ))
291 "List of basic colors available on color displays. 292 "List of basic colors available on color displays.
292For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20. 293For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
293For Nextstep, this is a list of non-PANTONE colors returned by 294For Nextstep, this is a list of non-PANTONE colors returned by