diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/faces.el | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef91deddc1d..ff9a8ad19df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-12-05 Chong Yidong <cyd@gnu.org> + + * faces.el (read-color): Doc fix. + 2011-12-05 Glenn Morris <rgm@gnu.org> * align.el (align--set-marker): Add doc-string. diff --git a/lisp/faces.el b/lisp/faces.el index f10c9f87f25..21193589deb 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1704,13 +1704,14 @@ If omitted or nil, that stands for the selected frame's display." (> (tty-color-gray-shades display) 2))))) (defun read-color (&optional prompt convert-to-RGB allow-empty-name msg) - "Read a color name or RGB triplet of the form \"#RRRRGGGGBBBB\". + "Read a color name or RGB triplet. Completion is available for color names, but not for RGB triplets. -RGB triplets have the form #XXXXXXXXXXXX, where each X is a hex -digit. The number of Xs must be a multiple of 3, with the same -number of Xs for each of red, green, and blue. The order is red, -green, blue. +RGB triplets have the form \"#RRGGBB\". Each of the R, G, and B +components can have one to four digits, but all three components +must have the same number of digits. Each digit is a hex value +between 0 and F; either upper case or lower case for A through F +are acceptable. In addition to standard color names and RGB hex values, the following are available as color candidates. In each case, the |