procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* doc/lispref/minibuf.texi (High-Level Completion): Updates for read-color.

Browse source 
* etc/NEWS: Likewise.
This commit is contained in:
Glenn Morris 2012-02-03 20:23:09 -05:00
parent bd5cfef1b5
commit 94bc79845c
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-04 Glenn Morris <rgm@gnu.org>
* minibuf.texi (High-Level Completion): Updates for read-color.
2012-02-03 Glenn Morris <rgm@gnu.org>
* display.texi (GIF Images): Mention animation.

12
doc/lispref/minibuf.texi
View file

@ -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

9
etc/NEWS
View file

@ -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,