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

[Miles Bader]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.85 emacs/lispref/display.texi:1.86
*** emacs/lispref/display.texi:1.85     Sun Jul  7 19:43:25 2002
--- emacs/lispref/display.texi  Sun Jul  7 19:58:31 2002
***************
*** 1767,1781 ****
  They return the symbol @code{unspecified} if the face doesn't define any
  value for that attribute.
  
! @defun face-foreground face &optional frame
  @defunx face-background face &optional frame
  These functions return the foreground color (or background color,
  respectively) of face @var{face}, as a string.
  @end defun
  
! @defun face-stipple face &optional frame
  This function returns the name of the background stipple pattern of face
  @var{face}, or @code{nil} if it doesn't have one.
  @end defun
  
  @defun face-font face &optional frame
--- 1767,1795 ----
  They return the symbol @code{unspecified} if the face doesn't define any
  value for that attribute.
  
! @defun face-foreground face &optional frame inherit
  @defunx face-background face &optional frame
  These functions return the foreground color (or background color,
  respectively) of face @var{face}, as a string.
+ 
+ If @var{inherit} is nil, only a color directly defined by the face is
+ returned.  If @var{inherit} is non-nil, any faces specified by its
+ @code{:inherit} attribute are considered as well, and if @var{inherit}
+ is a face or a list of faces, then they are also considered, until a
+ specified color is found.  To ensure that the return value is always
+ specified, use a value of @code{default} for @var{inherit}.
  @end defun
  
! @defun face-stipple face &optional frame inherit
  This function returns the name of the background stipple pattern of face
  @var{face}, or @code{nil} if it doesn't have one.
+ 
+ If @var{inherit} is nil, only a stipple directly defined by the face
+ is returned.  If @var{inherit} is non-nil, any faces specified by its
+ @code{:inherit} attribute are considered as well, and if @var{inherit}
+ is a face or a list of faces, then they are also considered, until a
+ specified stipple is found.  To ensure that the return value is always
+ specified, use a value of @code{default} for @var{inherit}.
  @end defun
  
  @defun face-font face &optional frame