Commit 89877f5f authored by Chong Yidong's avatar Chong Yidong
Browse files

Add all rgb.txt color names to x-colors.

* facemenu.el (list-colors-print): Don't print extra names if it
will overflow the window width.

* term/common-win.el (x-colors): Add all the color names defined
in rgb.txt (Bug#6332).
parent 6e6e5760
2010-06-12 Chong Yidong <cyd@stupidchicken.com>
* facemenu.el (list-colors-print): Don't print extra names if it
will overflow the window width.
* vc/log-edit.el (log-edit-font-lock-keywords): Revert 2010-06-02
change temporarily (Bug#6343).
2010-06-12 Eli Zaretskii <eliz@gnu.org>
* files.el (make-directory): Doc fix (bug#6396).
......@@ -335,7 +343,7 @@
exists. Raise an error, if not (due to a corresponding answer
"no" in interactive questions, for example).
22010-06-02 Dan Nicolaescu <dann@ics.uci.edu>
2010-06-02 Dan Nicolaescu <dann@ics.uci.edu>
* log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax.
......
......@@ -526,15 +526,27 @@ name."
(let* ((opoint (point))
(color-values (color-values (car color)))
(light-p (>= (apply 'max color-values)
(* (car (color-values "white")) .5))))
(* (car (color-values "white")) .5)))
(max-len (max (- (window-width) 33) 20)))
(insert (car color))
(indent-to 22)
(put-text-property opoint (point) 'face `(:background ,(car color)))
(put-text-property
(prog1 (point)
(insert " " (if (cdr color)
(mapconcat 'identity (cdr color) ", ")
(car color))))
(insert " ")
(if (cdr color)
;; Insert as many color names as possible, fitting max-len.
(let ((names (list (car color)))
(others (cdr color))
(len (length (car color)))
newlen)
(while (and others
(< (setq newlen (+ len 2 (length (car others))))
max-len))
(setq len newlen)
(push (pop others) names))
(insert (mapconcat 'identity (nreverse names) ", ")))
(insert (car color))))
(point)
'face (list :foreground (car color)))
(indent-to (max (- (window-width) 8) 44))
......
......@@ -205,90 +205,167 @@ This function returns ARGS minus the arguments that have been processed."
(defvar x-colors
(purecopy
'("gray100" "gray99" "gray98" "gray97" "gray96" "gray95" "gray94" "gray93" "gray92"
"gray91" "gray90" "gray89" "gray88" "gray87" "gray86" "gray85" "gray84" "gray83"
"gray82" "gray81" "gray80" "gray79" "gray78" "gray77" "gray76" "gray75" "gray74"
"gray73" "gray72" "gray71" "gray70" "gray69" "gray68" "gray67" "gray66" "gray65"
"gray64" "gray63" "gray62" "gray61" "gray60" "gray59" "gray58" "gray57" "gray56"
"gray55" "gray54" "gray53" "gray52" "gray51" "gray50" "gray49" "gray48" "gray47"
"gray46" "gray45" "gray44" "gray43" "gray42" "gray41" "gray40" "gray39" "gray38"
"gray37" "gray36" "gray35" "gray34" "gray33" "gray32" "gray31" "gray30" "gray29"
"gray28" "gray27" "gray26" "gray25" "gray24" "gray23" "gray22" "gray21" "gray20"
"gray19" "gray18" "gray17" "gray16" "gray15" "gray14" "gray13" "gray12" "gray11"
"gray10" "gray9" "gray8" "gray7" "gray6" "gray5" "gray4" "gray3" "gray2" "gray1"
"gray0" "LightPink1" "LightPink2" "LightPink3" "LightPink4" "pink1" "pink2" "pink3"
"pink4" "PaleVioletRed1" "PaleVioletRed2" "PaleVioletRed3" "PaleVioletRed4"
"LavenderBlush1" "LavenderBlush2" "LavenderBlush3" "LavenderBlush4" "VioletRed1"
"VioletRed2" "VioletRed3" "VioletRed4" "HotPink1" "HotPink2" "HotPink3" "HotPink4"
"DeepPink1" "DeepPink2" "DeepPink3" "DeepPink4" "maroon1" "maroon2" "maroon3"
"maroon4" "orchid1" "orchid2" "orchid3" "orchid4" "plum1" "plum2" "plum3" "plum4"
"thistle1" "thistle2" "thistle3" "thistle4" "MediumOrchid1" "MediumOrchid2"
"MediumOrchid3" "MediumOrchid4" "DarkOrchid1" "DarkOrchid2" "DarkOrchid3"
"DarkOrchid4" "purple1" "purple2" "purple3" "purple4" "MediumPurple1"
"MediumPurple2" "MediumPurple3" "MediumPurple4" "SlateBlue1" "SlateBlue2"
"SlateBlue3" "SlateBlue4" "RoyalBlue1" "RoyalBlue2" "RoyalBlue3" "RoyalBlue4"
"LightSteelBlue1" "LightSteelBlue2" "LightSteelBlue3" "LightSteelBlue4" "SlateGray1"
"SlateGray2" "SlateGray3" "SlateGray4" "DodgerBlue1" "DodgerBlue2" "DodgerBlue3"
"DodgerBlue4" "SteelBlue1" "SteelBlue2" "SteelBlue3" "SteelBlue4" "SkyBlue1"
"SkyBlue2" "SkyBlue3" "SkyBlue4" "LightSkyBlue1" "LightSkyBlue2" "LightSkyBlue3"
"LightSkyBlue4" "LightBlue1" "LightBlue2" "LightBlue3" "LightBlue4" "CadetBlue1"
"CadetBlue2" "CadetBlue3" "CadetBlue4" "azure1" "azure2" "azure3" "azure4"
"LightCyan1" "LightCyan2" "LightCyan3" "LightCyan4" "PaleTurquoise1"
"PaleTurquoise2" "PaleTurquoise3" "PaleTurquoise4" "DarkSlateGray1" "DarkSlateGray2"
"DarkSlateGray3" "DarkSlateGray4" "aquamarine1" "aquamarine2" "aquamarine3"
"aquamarine4" "SeaGreen1" "SeaGreen2" "SeaGreen3" "SeaGreen4" "honeydew1"
"honeydew2" "honeydew3" "honeydew4" "DarkSeaGreen1" "DarkSeaGreen2" "DarkSeaGreen3"
"DarkSeaGreen4" "PaleGreen1" "PaleGreen2" "PaleGreen3" "PaleGreen4"
"DarkOliveGreen1" "DarkOliveGreen2" "DarkOliveGreen3" "DarkOliveGreen4" "OliveDrab1"
"OliveDrab2" "OliveDrab3" "OliveDrab4" "ivory1" "ivory2" "ivory3" "ivory4"
"LightYellow1" "LightYellow2" "LightYellow3" "LightYellow4" "khaki1" "khaki2"
"khaki3" "khaki4" "LemonChiffon1" "LemonChiffon2" "LemonChiffon3" "LemonChiffon4"
"LightGoldenrod1" "LightGoldenrod2" "LightGoldenrod3" "LightGoldenrod4" "cornsilk1"
"cornsilk2" "cornsilk3" "cornsilk4" "goldenrod1" "goldenrod2" "goldenrod3"
"goldenrod4" "DarkGoldenrod1" "DarkGoldenrod2" "DarkGoldenrod3" "DarkGoldenrod4"
"wheat1" "wheat2" "wheat3" "wheat4" "NavajoWhite1" "NavajoWhite2" "NavajoWhite3"
"NavajoWhite4" "burlywood1" "burlywood2" "burlywood3" "burlywood4" "AntiqueWhite1"
"AntiqueWhite2" "AntiqueWhite3" "AntiqueWhite4" "bisque1" "bisque2" "bisque3"
"bisque4" "tan1" "tan2" "tan3" "tan4" "PeachPuff1" "PeachPuff2" "PeachPuff3"
"PeachPuff4" "seashell1" "seashell2" "seashell3" "seashell4" "chocolate1"
"chocolate2" "chocolate3" "chocolate4" "sienna1" "sienna2" "sienna3" "sienna4"
"LightSalmon1" "LightSalmon2" "LightSalmon3" "LightSalmon4" "salmon1" "salmon2"
"salmon3" "salmon4" "coral1" "coral2" "coral3" "coral4" "tomato1" "tomato2"
"tomato3" "tomato4" "MistyRose1" "MistyRose2" "MistyRose3" "MistyRose4" "snow1"
"snow2" "snow3" "snow4" "RosyBrown1" "RosyBrown2" "RosyBrown3" "RosyBrown4"
"IndianRed1" "IndianRed2" "IndianRed3" "IndianRed4" "firebrick1" "firebrick2"
"firebrick3" "firebrick4" "brown1" "brown2" "brown3" "brown4" "magenta1" "magenta2"
"magenta3" "magenta4" "blue1" "blue2" "blue3" "blue4" "DeepSkyBlue1" "DeepSkyBlue2"
"DeepSkyBlue3" "DeepSkyBlue4" "turquoise1" "turquoise2" "turquoise3" "turquoise4"
"cyan1" "cyan2" "cyan3" "cyan4" "SpringGreen1" "SpringGreen2" "SpringGreen3"
"SpringGreen4" "green1" "green2" "green3" "green4" "chartreuse1" "chartreuse2"
"chartreuse3" "chartreuse4" "yellow1" "yellow2" "yellow3" "yellow4" "gold1" "gold2"
"gold3" "gold4" "orange1" "orange2" "orange3" "orange4" "DarkOrange1" "DarkOrange2"
"DarkOrange3" "DarkOrange4" "OrangeRed1" "OrangeRed2" "OrangeRed3" "OrangeRed4"
"red1" "red2" "red3" "red4" "lavender blush" "ghost white" "lavender" "alice blue"
"azure" "light cyan" "mint cream" "honeydew" "ivory" "light goldenrod yellow"
"light yellow" "beige" "floral white" "old lace" "blanched almond" "moccasin"
"papaya whip" "bisque" "antique white" "linen" "peach puff" "seashell" "misty rose"
"snow" "light pink" "pink" "hot pink" "deep pink" "maroon" "pale violet red"
"violet red" "medium violet red" "violet" "plum" "thistle" "orchid" "medium orchid"
"dark orchid" "purple" "blue violet" "medium purple" "light slate blue"
"medium slate blue" "slate blue" "dark slate blue" "midnight blue" "navy"
"dark blue" "light steel blue" "cornflower blue" "dodger blue" "royal blue"
"light slate gray" "slate gray" "dark slate gray" "steel blue" "cadet blue"
"light sky blue" "sky blue" "light blue" "powder blue" "pale turquoise"
"turquoise" "medium turquoise" "dark turquoise" "dark cyan" "aquamarine"
"medium aquamarine" "light sea green"
"medium sea green" "sea green" "dark sea green" "pale green" "lime green"
"dark green" "forest green" "light green" "green yellow" "yellow green" "olive drab"
"dark olive green" "lemon chiffon" "khaki" "dark khaki" "cornsilk"
"pale goldenrod" "light goldenrod" "goldenrod" "dark goldenrod" "wheat"
"navajo white" "tan" "burlywood" "sandy brown" "peru" "chocolate" "saddle brown"
"sienna" "rosy brown" "dark salmon" "coral" "tomato" "light salmon" "salmon"
"light coral" "indian red" "firebrick" "brown" "dark red" "magenta"
"dark magenta" "dark violet" "medium blue" "blue" "deep sky blue"
"cyan" "medium spring green" "spring green" "green" "lawn green" "chartreuse"
"yellow" "gold" "orange" "dark orange" "orange red" "red" "white" "white smoke"
"gainsboro" "light gray" "gray" "dark gray" "dim gray" "black" ))
'("gray100" "grey100" "gray99" "grey99" "gray98" "grey98" "gray97"
"grey97" "gray96" "grey96" "gray95" "grey95" "gray94" "grey94"
"gray93" "grey93" "gray92" "grey92" "gray91" "grey91" "gray90"
"grey90" "gray89" "grey89" "gray88" "grey88" "gray87" "grey87"
"gray86" "grey86" "gray85" "grey85" "gray84" "grey84" "gray83"
"grey83" "gray82" "grey82" "gray81" "grey81" "gray80" "grey80"
"gray79" "grey79" "gray78" "grey78" "gray77" "grey77" "gray76"
"grey76" "gray75" "grey75" "gray74" "grey74" "gray73" "grey73"
"gray72" "grey72" "gray71" "grey71" "gray70" "grey70" "gray69"
"grey69" "gray68" "grey68" "gray67" "grey67" "gray66" "grey66"
"gray65" "grey65" "gray64" "grey64" "gray63" "grey63" "gray62"
"grey62" "gray61" "grey61" "gray60" "grey60" "gray59" "grey59"
"gray58" "grey58" "gray57" "grey57" "gray56" "grey56" "gray55"
"grey55" "gray54" "grey54" "gray53" "grey53" "gray52" "grey52"
"gray51" "grey51" "gray50" "grey50" "gray49" "grey49" "gray48"
"grey48" "gray47" "grey47" "gray46" "grey46" "gray45" "grey45"
"gray44" "grey44" "gray43" "grey43" "gray42" "grey42" "gray41"
"grey41" "gray40" "grey40" "gray39" "grey39" "gray38" "grey38"
"gray37" "grey37" "gray36" "grey36" "gray35" "grey35" "gray34"
"grey34" "gray33" "grey33" "gray32" "grey32" "gray31" "grey31"
"gray30" "grey30" "gray29" "grey29" "gray28" "grey28" "gray27"
"grey27" "gray26" "grey26" "gray25" "grey25" "gray24" "grey24"
"gray23" "grey23" "gray22" "grey22" "gray21" "grey21" "gray20"
"grey20" "gray19" "grey19" "gray18" "grey18" "gray17" "grey17"
"gray16" "grey16" "gray15" "grey15" "gray14" "grey14" "gray13"
"grey13" "gray12" "grey12" "gray11" "grey11" "gray10" "grey10"
"gray9" "grey9" "gray8" "grey8" "gray7" "grey7" "gray6" "grey6"
"gray5" "grey5" "gray4" "grey4" "gray3" "grey3" "gray2" "grey2"
"gray1" "grey1" "gray0" "grey0"
"LightPink1" "LightPink2" "LightPink3" "LightPink4"
"pink1" "pink2" "pink3" "pink4"
"PaleVioletRed1" "PaleVioletRed2" "PaleVioletRed3" "PaleVioletRed4"
"LavenderBlush1" "LavenderBlush2" "LavenderBlush3" "LavenderBlush4"
"VioletRed1" "VioletRed2" "VioletRed3" "VioletRed4"
"HotPink1" "HotPink2" "HotPink3" "HotPink4"
"DeepPink1" "DeepPink2" "DeepPink3" "DeepPink4"
"maroon1" "maroon2" "maroon3" "maroon4"
"orchid1" "orchid2" "orchid3" "orchid4"
"plum1" "plum2" "plum3" "plum4"
"thistle1" "thistle2" "thistle3" "thistle4"
"MediumOrchid1" "MediumOrchid2" "MediumOrchid3" "MediumOrchid4"
"DarkOrchid1" "DarkOrchid2" "DarkOrchid3" "DarkOrchid4"
"purple1" "purple2" "purple3" "purple4"
"MediumPurple1" "MediumPurple2" "MediumPurple3" "MediumPurple4"
"SlateBlue1" "SlateBlue2" "SlateBlue3" "SlateBlue4"
"RoyalBlue1" "RoyalBlue2" "RoyalBlue3" "RoyalBlue4"
"LightSteelBlue1" "LightSteelBlue2" "LightSteelBlue3" "LightSteelBlue4"
"SlateGray1" "SlateGray2" "SlateGray3" "SlateGray4"
"DodgerBlue1" "DodgerBlue2" "DodgerBlue3" "DodgerBlue4"
"SteelBlue1" "SteelBlue2" "SteelBlue3" "SteelBlue4"
"SkyBlue1" "SkyBlue2" "SkyBlue3" "SkyBlue4"
"LightSkyBlue1" "LightSkyBlue2" "LightSkyBlue3" "LightSkyBlue4"
"LightBlue1" "LightBlue2" "LightBlue3" "LightBlue4"
"CadetBlue1" "CadetBlue2" "CadetBlue3" "CadetBlue4"
"azure1" "azure2" "azure3" "azure4"
"LightCyan1" "LightCyan2" "LightCyan3" "LightCyan4"
"PaleTurquoise1" "PaleTurquoise2" "PaleTurquoise3" "PaleTurquoise4"
"DarkSlateGray1" "DarkSlateGray2" "DarkSlateGray3" "DarkSlateGray4"
"aquamarine1" "aquamarine2" "aquamarine3" "aquamarine4"
"SeaGreen1" "SeaGreen2" "SeaGreen3" "SeaGreen4"
"honeydew1" "honeydew2" "honeydew3" "honeydew4"
"DarkSeaGreen1" "DarkSeaGreen2" "DarkSeaGreen3" "DarkSeaGreen4"
"PaleGreen1" "PaleGreen2" "PaleGreen3" "PaleGreen4"
"DarkOliveGreen1" "DarkOliveGreen2" "DarkOliveGreen3" "DarkOliveGreen4"
"OliveDrab1" "OliveDrab2" "OliveDrab3" "OliveDrab4"
"ivory1" "ivory2" "ivory3" "ivory4"
"LightYellow1" "LightYellow2" "LightYellow3" "LightYellow4"
"khaki1" "khaki2" "khaki3" "khaki4"
"LemonChiffon1" "LemonChiffon2" "LemonChiffon3" "LemonChiffon4"
"LightGoldenrod1" "LightGoldenrod2" "LightGoldenrod3" "LightGoldenrod4"
"cornsilk1" "cornsilk2" "cornsilk3" "cornsilk4"
"goldenrod1" "goldenrod2" "goldenrod3" "goldenrod4"
"DarkGoldenrod1" "DarkGoldenrod2" "DarkGoldenrod3" "DarkGoldenrod4"
"wheat1" "wheat2" "wheat3" "wheat4"
"NavajoWhite1" "NavajoWhite2" "NavajoWhite3" "NavajoWhite4"
"burlywood1" "burlywood2" "burlywood3" "burlywood4"
"AntiqueWhite1" "AntiqueWhite2" "AntiqueWhite3" "AntiqueWhite4"
"bisque1" "bisque2" "bisque3" "bisque4"
"tan1" "tan2" "tan3" "tan4"
"PeachPuff1" "PeachPuff2" "PeachPuff3" "PeachPuff4"
"seashell1" "seashell2" "seashell3" "seashell4"
"chocolate1" "chocolate2" "chocolate3" "chocolate4"
"sienna1" "sienna2" "sienna3" "sienna4"
"LightSalmon1" "LightSalmon2" "LightSalmon3" "LightSalmon4"
"salmon1" "salmon2" "salmon3" "salmon4"
"coral1" "coral2" "coral3" "coral4"
"tomato1" "tomato2" "tomato3" "tomato4"
"MistyRose1" "MistyRose2" "MistyRose3" "MistyRose4"
"snow1" "snow2" "snow3" "snow4"
"RosyBrown1" "RosyBrown2" "RosyBrown3" "RosyBrown4"
"IndianRed1" "IndianRed2" "IndianRed3" "IndianRed4"
"firebrick1" "firebrick2" "firebrick3" "firebrick4"
"brown1" "brown2" "brown3" "brown4"
"magenta1" "magenta2" "magenta3" "magenta4"
"blue1" "blue2" "blue3" "blue4"
"DeepSkyBlue1" "DeepSkyBlue2" "DeepSkyBlue3" "DeepSkyBlue4"
"turquoise1" "turquoise2" "turquoise3" "turquoise4"
"cyan1" "cyan2" "cyan3" "cyan4"
"SpringGreen1" "SpringGreen2" "SpringGreen3" "SpringGreen4"
"green1" "green2" "green3" "green4"
"chartreuse1" "chartreuse2" "chartreuse3" "chartreuse4"
"yellow1" "yellow2" "yellow3" "yellow4"
"gold1" "gold2" "gold3" "gold4"
"orange1" "orange2" "orange3" "orange4"
"DarkOrange1" "DarkOrange2" "DarkOrange3" "DarkOrange4"
"OrangeRed1" "OrangeRed2" "OrangeRed3" "OrangeRed4"
"red1" "red2" "red3" "red4"
"lavender blush" "LavenderBlush" "ghost white" "GhostWhite"
"lavender" "alice blue" "AliceBlue" "azure" "light cyan"
"LightCyan" "mint cream" "MintCream" "honeydew" "ivory"
"light goldenrod yellow" "LightGoldenrodYellow" "light yellow"
"LightYellow" "beige" "floral white" "FloralWhite" "old lace"
"OldLace" "blanched almond" "BlanchedAlmond" "moccasin"
"papaya whip" "PapayaWhip" "bisque" "antique white"
"AntiqueWhite" "linen" "peach puff" "PeachPuff" "seashell"
"misty rose" "MistyRose" "snow" "light pink" "LightPink" "pink"
"hot pink" "HotPink" "deep pink" "DeepPink" "maroon"
"pale violet red" "PaleVioletRed" "violet red" "VioletRed"
"medium violet red" "MediumVioletRed" "violet" "plum" "thistle"
"orchid" "medium orchid" "MediumOrchid" "dark orchid"
"DarkOrchid" "purple" "blue violet" "BlueViolet" "medium purple"
"MediumPurple" "light slate blue" "LightSlateBlue"
"medium slate blue" "MediumSlateBlue" "slate blue" "SlateBlue"
"dark slate blue" "DarkSlateBlue" "midnight blue" "MidnightBlue"
"navy" "navy blue" "NavyBlue" "dark blue" "DarkBlue"
"light steel blue" "LightSteelBlue" "cornflower blue"
"CornflowerBlue" "dodger blue" "DodgerBlue" "royal blue"
"RoyalBlue" "light slate gray" "light slate grey"
"LightSlateGray" "LightSlateGrey" "slate gray" "slate grey"
"SlateGray" "SlateGrey" "dark slate gray" "dark slate grey"
"DarkSlateGray" "DarkSlateGrey" "steel blue" "SteelBlue"
"cadet blue" "CadetBlue" "light sky blue" "LightSkyBlue"
"sky blue" "SkyBlue" "light blue" "LightBlue" "powder blue"
"PowderBlue" "pale turquoise" "PaleTurquoise" "turquoise"
"medium turquoise" "MediumTurquoise" "dark turquoise"
"DarkTurquoise" "dark cyan" "DarkCyan" "aquamarine"
"medium aquamarine" "MediumAquamarine" "light sea green"
"LightSeaGreen" "medium sea green" "MediumSeaGreen" "sea green"
"SeaGreen" "dark sea green" "DarkSeaGreen" "pale green"
"PaleGreen" "lime green" "LimeGreen" "dark green" "DarkGreen"
"forest green" "ForestGreen" "light green" "LightGreen"
"green yellow" "GreenYellow" "yellow green" "YellowGreen"
"olive drab" "OliveDrab" "dark olive green" "DarkOliveGreen"
"lemon chiffon" "LemonChiffon" "khaki" "dark khaki" "DarkKhaki"
"cornsilk" "pale goldenrod" "PaleGoldenrod" "light goldenrod"
"LightGoldenrod" "goldenrod" "dark goldenrod" "DarkGoldenrod"
"wheat" "navajo white" "NavajoWhite" "tan" "burlywood"
"sandy brown" "SandyBrown" "peru" "chocolate" "saddle brown"
"SaddleBrown" "sienna" "rosy brown" "RosyBrown" "dark salmon"
"DarkSalmon" "coral" "tomato" "light salmon" "LightSalmon"
"salmon" "light coral" "LightCoral" "indian red" "IndianRed"
"firebrick" "brown" "dark red" "DarkRed" "magenta"
"dark magenta" "DarkMagenta" "dark violet" "DarkViolet"
"medium blue" "MediumBlue" "blue" "deep sky blue" "DeepSkyBlue"
"cyan" "medium spring green" "MediumSpringGreen" "spring green"
"SpringGreen" "green" "lawn green" "LawnGreen" "chartreuse"
"yellow" "gold" "orange" "dark orange" "DarkOrange" "orange red"
"OrangeRed" "red" "white" "white smoke" "WhiteSmoke" "gainsboro"
"light gray" "light grey" "LightGray" "LightGrey" "gray" "grey"
"dark gray" "dark grey" "DarkGray" "DarkGrey" "dim gray"
"dim grey" "DimGray" "DimGrey" "black"))
"List of basic colors available on color displays.
For X, the list comes from the `rgb.txt' file,v 10.41 94/02/20.
For Nextstep, this is a list of non-PANTONE colors returned by
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment