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

[Luc Teirlinck]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.158 emacs/lispref/display.texi:1.159
*** emacs/lispref/display.texi:1.158    Sun May  1 14:00:32 2005
--- emacs/lispref/display.texi  Sun May  1 17:01:44 2005
***************
*** 1142,1150 ****
  @var{end} whose property @var{name} has the value @var{value}.  It can
  move the endpoints of the overlays in the region, or split them.
  
! If @var{name} is omitted or nil, it means to delete all overlays in
  the specified region.  If @var{start} and/or @var{end} are omitted or
! nil, that means the beginning and end of the buffer respectively.
  Therefore, @code{(remove-overlays)} removes all the overlays in the
  current buffer.
  @end defun
--- 1142,1150 ----
  @var{end} whose property @var{name} has the value @var{value}.  It can
  move the endpoints of the overlays in the region, or split them.
  
! If @var{name} is omitted or @code{nil}, it means to delete all overlays in
  the specified region.  If @var{start} and/or @var{end} are omitted or
! @code{nil}, that means the beginning and end of the buffer respectively.
  Therefore, @code{(remove-overlays)} removes all the overlays in the
  current buffer.
  @end defun
***************
*** 1556,1562 ****
  adding blank areas between the images.
  
    If the property value is not @code{t}, it is a height spec.  A height
! spec stands for a numeric height value; this heigh spec specifies the
  actual line height, @var{line-height}.  There are several ways to
  write a height spec; here's how each of them translates into a numeric
  height:
--- 1556,1562 ----
  adding blank areas between the images.
  
    If the property value is not @code{t}, it is a height spec.  A height
! spec stands for a numeric height value; this height spec specifies the
  actual line height, @var{line-height}.  There are several ways to
  write a height spec; here's how each of them translates into a numeric
  height:
***************
*** 1572,1578 ****
  is @var{ratio} times the height of face @var{face}.  @var{ratio} can
  be any type of number, or @code{nil} which means a ratio of 1.
  If @var{face} is @code{t}, it refers to the current face.
! @item (@code{nil} . @var{ratio})
  If the height spec is a cons of the format shown, the numeric height
  is @var{ratio} times the height of the contents of the line.
  @end table
--- 1572,1578 ----
  is @var{ratio} times the height of face @var{face}.  @var{ratio} can
  be any type of number, or @code{nil} which means a ratio of 1.
  If @var{face} is @code{t}, it refers to the current face.
! @item (nil . @var{ratio})
  If the height spec is a cons of the format shown, the numeric height
  is @var{ratio} times the height of the contents of the line.
  @end table
***************
*** 1583,1589 ****
  the line to achieve the total height @var{line-height}.  Otherwise,
  @var{line-height} has no effect.
  
!   If you don't specify the @code{line-height} propery, the line's
  height consists of the contents' height plus the line spacing.
  There are several ways to specify the line spacing for different
  parts of Emacs text.
--- 1583,1589 ----
  the line to achieve the total height @var{line-height}.  Otherwise,
  @var{line-height} has no effect.
  
!   If you don't specify the @code{line-height} property, the line's
  height consists of the contents' height plus the line spacing.
  There are several ways to specify the line spacing for different
  parts of Emacs text.
***************
*** 2984,2990 ****
  @code{overlay-arrow-variable-list}.
  
  @defvar overlay-arrow-variable-list
! This variable's value is a list of varibles, each of which specifies
  the position of an overlay arrow.  The variable
  @code{overlay-arrow-position} has its normal meaning because it is on
  this list.
--- 2984,2990 ----
  @code{overlay-arrow-variable-list}.
  
  @defvar overlay-arrow-variable-list
! This variable's value is a list of variables, each of which specifies
  the position of an overlay arrow.  The variable
  @code{overlay-arrow-position} has its normal meaning because it is on
  this list.
***************
*** 3160,3166 ****
  @noindent
  This illustrates that what matters is the property value for
  each character.  If two consecutive characters have the same
! object as the @code{display} property value, it's irrelevent
  whether they got this property from a single call to
  @code{put-text-property} or from two different calls.
  
--- 3160,3166 ----
  @noindent
  This illustrates that what matters is the property value for
  each character.  If two consecutive characters have the same
! object as the @code{display} property value, it's irrelevant
  whether they got this property from a single call to
  @code{put-text-property} or from two different calls.