[Emacs-diffs] Changes to emacs/etc/NEWS

[Kim F . Storm]

Index: emacs/etc/NEWS
diff -c emacs/etc/NEWS:1.1098 emacs/etc/NEWS:1.1099
*** emacs/etc/NEWS:1.1098       Tue Jan  4 21:15:09 2005
--- emacs/etc/NEWS      Wed Jan  5 16:36:19 2005
***************
*** 1830,1836 ****
  modes set require-final-newline.  By default that's C, C++ and
  Objective-C.
  
! The specified modes set require-final-newline based on 
  mode-require-final-newline, as usual.
  
  *** Format change for syntactic context elements.
--- 1830,1836 ----
  modes set require-final-newline.  By default that's C, C++ and
  Objective-C.
  
! The specified modes set require-final-newline based on
  mode-require-final-newline, as usual.
  
  *** Format change for syntactic context elements.
***************
*** 2619,2625 ****
  A newline may now have line-height and line-spacing text or overlay
  properties that control the height of the corresponding display row.
  
! If the line-height property value is 0, the newline does not
  contribute to the height of the display row; instead the height of the
  newline glyph is reduced.  Also, a line-spacing property on this
  newline is ignored.  This can be used to tile small images or image
--- 2619,2625 ----
  A newline may now have line-height and line-spacing text or overlay
  properties that control the height of the corresponding display row.
  
! If the line-height property value is t, the newline does not
  contribute to the height of the display row; instead the height of the
  newline glyph is reduced.  Also, a line-spacing property on this
  newline is ignored.  This can be used to tile small images or image
***************
*** 2633,2642 ****
  is calculated by multiplying the default frame line height by the
  given value.
  
! If the line-height property value is a cons (RATIO . FACE), the
  minimum line height is calculated as RATIO * height of named FACE.
  RATIO is int or float.  If FACE is t, it specifies the current face.
  
  If the line-spacing property value is an positive integer, the value
  is used as additional pixels to insert after the display line; this
  overrides the default frame line-spacing and any buffer local value of
--- 2633,2651 ----
  is calculated by multiplying the default frame line height by the
  given value.
  
! If the line-height property value is a cons (FACE . RATIO), the
  minimum line height is calculated as RATIO * height of named FACE.
  RATIO is int or float.  If FACE is t, it specifies the current face.
  
+ If the line-height property value is a cons (nil . RATIO), the line
+ height is calculated as RATIO * actual height of the line's contents.
+ 
+ If the line-height value is a cons (HEIGHT . TOTAL), HEIGHT specifies
+ the line height as described above, while TOTAL is any of the forms
+ described above and specifies the total height of the line, causing a
+ varying number of pixels to be inserted after the line to make it line
+ exactly that many pixels high.
+ 
  If the line-spacing property value is an positive integer, the value
  is used as additional pixels to insert after the display line; this
  overrides the default frame line-spacing and any buffer local value of
***************
*** 2645,2655 ****
  If the line-spacing property may be a float or cons, the line spacing
  is calculated as specified above for the line-height property.
  
- If the line-spacing value is a cons (total . SPACING) where SPACING is
- any of the forms described above, the value of SPACING is used as the
- total height of the line, i.e. a varying number of pixels are inserted
- after each line to make each line exactly that many pixels high.
- 
  ** The buffer local line-spacing variable may now have a float value,
  which is used as a height relative to the default frame line height.
  
--- 2654,2659 ----