# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104589052 0
# Node ID 120ce8e206a50607c3d4bf7c49dcf6d7d6f25cb3
# Parent  d50d807507e0146088db64531445c6e780fdb79b
(Face Attributes): Describe hex color specs.

diff -r d50d807507e0 -r 120ce8e206a5 lispref/display.texi
--- a/lispref/display.texi	Sat Jan 01 13:08:33 2005 +0000
+++ b/lispref/display.texi	Sat Jan 01 14:17:32 2005 +0000
@@ -1636,7 +1636,7 @@
 * Defining Faces::      How to define a face with @code{defface}.
 * Face Attributes::     What is in a face?
 * Attribute Functions::  Functions to examine and set face attributes.
-* Merging Faces::       How Emacs combines the faces specified for a character.
+* Displaying Faces::     How Emacs combines the faces specified for a character.
 * Font Selection::      Finding the best available font for a face.
 * Face Functions::      How to define and examine faces.
 * Auto Faces::          Hook for automatic face assignment.
@@ -1941,10 +1941,14 @@
 the terminal supports the feature.
 
 @item :foreground
-Foreground color, a string.
+Foreground color, a string.  The value can be a system-defined color
+name, or a hexadecimal color specification of the form
+@samp{#@var{rr}@var{gg}@var{bb}}.  (@samp{#000000} is black,
+@samp{#ff0000} is red, @samp{#00ff00} is green, @samp{#0000ff} is
+blue, and @samp{#ffffff} is white.)
 
 @item :background
-Background color, a string.
+Background color, a string, like the foreground color.
 
 @item :inverse-video
 Whether or not characters should be displayed in inverse video.  The
@@ -2265,8 +2269,8 @@
 This function returns the @code{:inverse-video} attribute of face @var{face}.
 @end defun
 
-@node Merging Faces
-@subsection Merging Faces for Display
+@node Displaying Faces
+@subsection Displaying Faces
 
   Here are the ways to specify which faces to use for display of text: