diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/facemenu.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3ab7fe35140..f1c83da671a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-06-15 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * facemenu.el (list-colors-sort): Doc fix. | ||
| 4 | |||
| 1 | 2010-06-15 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change) | 5 | 2010-06-15 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change) |
| 2 | 6 | ||
| 3 | * progmodes/sql.el (sql-connect-mysql): Fix typo. | 7 | * progmodes/sql.el (sql-connect-mysql): Fix typo. |
diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 9e8299720a6..19b5967215a 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el | |||
| @@ -503,9 +503,9 @@ Output values for saturation and value are integers in [0..100] range." | |||
| 503 | `nil' means default implementation-dependent order (defined in `x-colors'). | 503 | `nil' means default implementation-dependent order (defined in `x-colors'). |
| 504 | `name' sorts by color name. | 504 | `name' sorts by color name. |
| 505 | `rgb' sorts by red, green, blue components. | 505 | `rgb' sorts by red, green, blue components. |
| 506 | `rgb-dist' sorts by the RGB distance to the specified color. | 506 | `(rgb-dist . COLOR)' sorts by the RGB distance to the specified color. |
| 507 | `hsv' sorts by hue, saturation, value. | 507 | `hsv' sorts by hue, saturation, value. |
| 508 | `hsv-dist' sorts by the HVS distance to the specified color | 508 | `(hsv-dist . COLOR)' sorts by the HSV distance to the specified color |
| 509 | and excludes grayscale colors." | 509 | and excludes grayscale colors." |
| 510 | :type '(choice (const :tag "Unsorted" nil) | 510 | :type '(choice (const :tag "Unsorted" nil) |
| 511 | (const :tag "Color Name" name) | 511 | (const :tag "Color Name" name) |