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

[Richard M. Stallman]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.93 emacs/lispref/display.texi:1.94
*** emacs/lispref/display.texi:1.93     Wed May 14 17:27:14 2003
--- emacs/lispref/display.texi  Tue Jun 24 14:14:50 2003
***************
*** 1668,1681 ****
  If @var{frame} is @code{t}, the value is the default for
  @var{face} for new frames.
  
! If @var{inherit} is nil, only attributes directly defined by
  @var{face} are considered, so the return value may be
! @code{unspecified}, or a relative value.  If @var{inherit} is non-nil,
! @var{face}'s definition of @var{attribute} is merged with the faces
! specified by its @code{:inherit} attribute; however the return value
! may still be @code{unspecified} or relative.  If @var{inherit} is a
! face or a list of faces, then the result is further merged with that
! face (or faces), until it becomes specified and absolute.
  
  To ensure that the return value is always specified and absolute, use
  a value of @code{default} for @var{inherit}; this will resolve any
--- 1668,1682 ----
  If @var{frame} is @code{t}, the value is the default for
  @var{face} for new frames.
  
! If @var{inherit} is @code{nil}, only attributes directly defined by
  @var{face} are considered, so the return value may be
! @code{unspecified}, or a relative value.  If @var{inherit} is
! address@hidden, @var{face}'s definition of @var{attribute} is merged
! with the faces specified by its @code{:inherit} attribute; however the
! return value may still be @code{unspecified} or relative.  If
! @var{inherit} is a face or a list of faces, then the result is further
! merged with that face (or faces), until it becomes specified and
! absolute.
  
  To ensure that the return value is always specified and absolute, use
  a value of @code{default} for @var{inherit}; this will resolve any
***************
*** 1790,1801 ****
  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
--- 1791,1803 ----
  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 @code{nil}, only a stipple directly defined by the
! face is returned.  If @var{inherit} is address@hidden, 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
***************
*** 2140,2148 ****
  specify these attributes for a face, it will use this font.
  
  The last three elements give additional information about the font.
! @var{fixed-p} is non-nil if the font is fixed-pitch.  @var{full} is the
! full name of the font, and @var{registry-and-encoding} is a string
! giving the registry and encoding of the font.
  
  The result list is sorted according to the current face font sort order.
  @end defun
--- 2142,2151 ----
  specify these attributes for a face, it will use this font.
  
  The last three elements give additional information about the font.
! @var{fixed-p} is address@hidden if the font is fixed-pitch.
! @var{full} is the full name of the font, and
! @var{registry-and-encoding} is a string giving the registry and
! encoding of the font.
  
  The result list is sorted according to the current face font sort order.
  @end defun
***************
*** 2685,2693 ****
  @var{bg} must be a list @code{(@var{red} @var{green} @var{blue})}
  specifying the color to assume for the background of the image.
  
! If @var{mask} is nil, remove a mask from the image, if it has one.  Images
! in some formats include a mask which can be removed by specifying
! @code{:mask nil}.
  @end table
  
  @defun image-mask-p spec &optional frame
--- 2688,2696 ----
  @var{bg} must be a list @code{(@var{red} @var{green} @var{blue})}
  specifying the color to assume for the background of the image.
  
! If @var{mask} is @code{nil}, remove a mask from the image, if it has
! one.  Images in some formats include a mask which can be removed by
! specifying @code{:mask nil}.
  @end table
  
  @defun image-mask-p spec &optional frame
***************
*** 3008,3017 ****
  @tindex image-size
  This function returns the size of an image as a pair
  @address@hidden(@var{width} . @var{height})}}.  @var{spec} is an image
! specification.  @var{pixels} non-nil means return sizes measured in
! pixels, otherwise return sizes measured in canonical character units
! (fractions of the width/height of the frame's default font).
! @var{frame} is the frame on which the image will be displayed.
  @var{frame} null or omitted means use the selected frame (@pxref{Input
  Focus}).
  @end defun
--- 3011,3020 ----
  @tindex image-size
  This function returns the size of an image as a pair
  @address@hidden(@var{width} . @var{height})}}.  @var{spec} is an image
! specification.  @var{pixels} address@hidden means return sizes
! measured in pixels, otherwise return sizes measured in canonical
! character units (fractions of the width/height of the frame's default
! font).  @var{frame} is the frame on which the image will be displayed.
  @var{frame} null or omitted means use the selected frame (@pxref{Input
  Focus}).
  @end defun