; Fix last change

* lisp/faces.el (faces--string-with-color, read-color): Doc fixes.

* doc/lispref/minibuf.texi (High-Level Completion): Fix markup and
wording.  (Bug#64725)

diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 4ed36edb8c191091f42f86b12db1bcc62a782540..8ff5c14055e22b487ddecc9fefaa8e97129bcbe8 100644 (file)
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1559,10 +1559,12 @@ non-@code{nil} and the user enters null input.
 Interactively, or when @var{display} is non-@code{nil}, the return
 value is also displayed in the echo area.
 
-The optional arguments FOREGROUND and FACE control the appearence of
-the completion candidates.  The candidates are displayed like FACE but
-with different colors.  If FOREGROUND is non-@code{nil} the foreground
-varies, otherwise the background.
+The optional arguments @var{foreground} and @var{face} control the
+appearence of the completion candidates in the @file{*Completions*}
+buffer.  The candidates are displayed in the specified @var{face} but
+with different colors: if @var{foreground} is non-@code{nil}, the
+foreground color is changed to be the color of the candidate,
+otherwise the background is changed to the candidate's color.
 @end deffn
 
   See also the functions @code{read-coding-system} and

diff --git a/lisp/faces.el b/lisp/faces.el
index 4f51a031156f14c45bdabd82cb76cb828d7e1647..dad16966f48ba20ceb9a04d488a8776b332635cb 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1880,7 +1880,7 @@ is nil; otherwise use the foreground color)."
 Set the :background or :foreground attribute to COLOR, depending
 on the argument FOREGROUND.
 
-The optional FACE argument controls the values for other
+The optional FACE argument determines the values of other face
 attributes."
   (let* ((defaults (if face (list face) '()))
          (colors (cond (foreground
@@ -2028,10 +2028,12 @@ to enter an empty color name (the empty string).
 Interactively, or with optional arg MSG non-nil, print the
 resulting color name in the echo area.
 
-Interactively, displays a list of colored completions.  If
-optional argument FOREGROUND is non-nil, shows them as
-foregrounds, otherwise as backgrounds.  The optional argument
-FACE controls the default appearance."
+Interactively, provides completion for selecting the color.  If
+the optional argument FOREGROUND is non-nil, shows the completion
+candidates with their foregound color changed to be the color of
+the candidate, otherwise changes the background color of the
+candidates.  The optional argument FACE determines the other
+face attributes of the candidates on display."
   (interactive "i\np\ni\np")    ; Always convert to RGB interactively.
   (let* ((completion-ignore-case t)
         (color-alist