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

[Luc Teirlinck]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.139 emacs/lispref/display.texi:1.140
*** emacs/lispref/display.texi:1.139    Sat Jan  1 14:17:32 2005
--- emacs/lispref/display.texi  Sat Jan  1 16:09:24 2005
***************
*** 1890,1896 ****
  attributes}.  This table lists all the face attributes, and what they
  mean.  Note that in general, more than one face can be specified for a
  given piece of text; when that happens, the attributes of all the faces
! are merged to specify how to display the text.  @xref{Merging Faces}.
  
    In Emacs 21, any attribute in a face can have the value
  @code{unspecified}.  This means the face doesn't specify that attribute.
--- 1890,1896 ----
  attributes}.  This table lists all the face attributes, and what they
  mean.  Note that in general, more than one face can be specified for a
  given piece of text; when that happens, the attributes of all the faces
! are merged to specify how to display the text.  @xref{Displaying Faces}.
  
    In Emacs 21, any attribute in a face can have the value
  @code{unspecified}.  This means the face doesn't specify that attribute.