From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 1 Jan 2005 14:17:32 +0000 (+0000)
Subject: (Face Attributes): Describe hex color specs.
X-Git-Tag: ttn-vms-21-2-B4~2991
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6057489e9cf0f44d59fa596d988e1005ccd7d25b;p=emacs.git

(Face Attributes): Describe hex color specs.
---

diff --git a/lispref/display.texi b/lispref/display.texi
index 01ba338621b..b4254197e50 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1636,7 +1636,7 @@ face name a special meaning in one frame if you wish.
 * 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 @@ On a text-only terminal, slanted text is displayed as half-bright, if
 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{:underline} attribute of face @var{face}.
 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: