[Emacs-diffs] Changes to emacs/lispref/display.texi

[Richard M . Stallman]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.138 emacs/lispref/display.texi:1.139
*** emacs/lispref/display.texi:1.138    Thu Dec 30 18:01:16 2004
--- emacs/lispref/display.texi  Sat Jan  1 14:17:32 2005
***************
*** 1636,1642 ****
  * 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.
  * 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.
--- 1636,1642 ----
  * 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.
! * 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,1950 ****
  the terminal supports the feature.
  
  @item :foreground
! Foreground color, a string.
  
  @item :background
! Background color, a string.
  
  @item :inverse-video
  Whether or not characters should be displayed in inverse video.  The
--- 1941,1954 ----
  the terminal supports the feature.
  
  @item :foreground
! Foreground color, a string.  The value can be a system-defined color
! name, or a hexadecimal color specification of the form
! @address@hidden@address@hidden  (@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, like the foreground color.
  
  @item :inverse-video
  Whether or not characters should be displayed in inverse video.  The
***************
*** 2265,2272 ****
  This function returns the @code{:inverse-video} attribute of face @var{face}.
  @end defun
  
! @node Merging Faces
! @subsection Merging Faces for Display
  
    Here are the ways to specify which faces to use for display of text:
  
--- 2269,2276 ----
  This function returns the @code{:inverse-video} attribute of face @var{face}.
  @end defun
  
! @node Displaying Faces
! @subsection Displaying Faces
  
    Here are the ways to specify which faces to use for display of text: