[Emacs-diffs] /srv/bzr/emacs/trunk r107081: * doc/lispref/minibuf.texi (High-Level Completion): Updates for read-color.

[Glenn Morris]

------------------------------------------------------------
revno: 107081
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-02-03 20:23:09 -0500
message:
  * doc/lispref/minibuf.texi (High-Level Completion): Updates for read-color.
  * etc/NEWS: Likewise.
modified:
  doc/lispref/ChangeLog
  doc/lispref/minibuf.texi
  etc/NEWS

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-02-03 08:44:30 +0000
+++ b/doc/lispref/ChangeLog     2012-02-04 01:23:09 +0000
@@ -1,3 +1,7 @@
+2012-02-04  Glenn Morris  <address@hidden>
+
+       * minibuf.texi (High-Level Completion): Updates for read-color.
+
 2012-02-03  Glenn Morris  <address@hidden>
 
        * display.texi (GIF Images): Mention animation.

=== modified file 'doc/lispref/minibuf.texi'
--- a/doc/lispref/minibuf.texi  2012-01-19 07:21:25 +0000
+++ b/doc/lispref/minibuf.texi  2012-02-04 01:23:09 +0000
@@ -1335,19 +1335,19 @@
 @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 address@hidden, 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 address@hidden, 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
 address@hidden and the user enters null input.
 
 Interactively, or when @var{display} is address@hidden, the return

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-02-04 01:01:23 +0000
+++ b/etc/NEWS  2012-02-04 01:23:09 +0000
@@ -1310,10 +1310,13 @@
 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,