From: Glenn Morris Date: Sat, 4 Feb 2012 01:23:09 +0000 (-0500) Subject: * doc/lispref/minibuf.texi (High-Level Completion): Updates for read-color. X-Git-Tag: emacs-pretest-24.0.94~340 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=94bc79845c7bec68561e086d7494749a40e48c23;p=emacs.git * doc/lispref/minibuf.texi (High-Level Completion): Updates for read-color. * etc/NEWS: Likewise. --- diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 45dc7673212..36780b20248 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-02-04 Glenn Morris + + * minibuf.texi (High-Level Completion): Updates for read-color. + 2012-02-03 Glenn Morris * display.texi (GIF Images): Mention animation. diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index e3008470233..a71138f5268 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1335,19 +1335,19 @@ but uses the predicate @code{user-variable-p} instead of @deffn Command read-color &optional prompt convert allow-empty display This function reads a string that is a color specification, either the color's name or an RGB hex value such as @code{#RRRGGGBBB}. It -prompts with @var{prompt} (default: @code{"Color (name or #R+G+B+):"}) +prompts with @var{prompt} (default: @code{"Color (name or #RGB triplet):"}) and provides completion for color names, but not for hex RGB values. In addition to names of standard colors, completion candidates include the foreground and background colors at point. Valid RGB values are described in @ref{Color Names}. -The function's return value is the color name typed by the user in the +The function's return value is the string typed by the user in the minibuffer. However, when called interactively or if the optional -argument @var{convert} is non-@code{nil}, it converts the name into -the color's RGB value and returns that value as a string. If an -invalid color name was specified, this function signals an error, -except that empty color names are allowed when @code{allow-empty} is +argument @var{convert} is non-@code{nil}, it converts any input color +name into the corresponding RGB value string and instead returns that. +This function requires a valid color specification to be input. +Empty color names are allowed when @code{allow-empty} is non-@code{nil} and the user enters null input. Interactively, or when @var{display} is non-@code{nil}, the return diff --git a/etc/NEWS b/etc/NEWS index 0e9181d7675..99be115e108 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1310,10 +1310,13 @@ Trashing is performed if TRASH and `delete-by-moving-to-trash' are both non-nil. Interactively, TRASH defaults to t, unless a prefix argument is supplied (see Trash changes, above). +--- ** `facemenu-read-color' is now an alias for `read-color'. -The command `read-color' now requires a match for a color name or RGB -triplet, instead of signaling an error if the user provides a invalid -input. + ++++ +** The command `read-color' now requires a match for a color name +or RGB triplet, instead of signaling an error if the user provides +invalid input. ** Tool-bars can display separators. Tool-bar separators are handled like menu separators in menu-bar maps,