*** empty log message ***

3 files changed, 21 insertions, 6 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 9076e32452d..e29f7996532 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2045,8 +2045,9 @@ 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.  This can be used to tile small images or
-image slices without adding blank areas between the images.
+newline glyph is reduced.  Also, a line-spacing property on this
+newline is ignored.  This can be used to tile small images or image
+slices without adding blank areas between the images.
 
 If the line-height property value is a positive integer, the value
 specifies the minimum line height in pixels.  If necessary, the line
@@ -2065,13 +2066,15 @@ is used as additional pixels to insert after the display line; this
 overrides the default frame line-spacing and any buffer local value of
 the line-spacing variable.
 
-If the value is a negative integer, the absolute value 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.
-
 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.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8800933c2fe..cd709102911 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,9 @@
         * ido.el (ido-read-internal): Fix call to read-file-name for edit.
         Must expand directory for completion to work; and don't mess with
         process-environment.
+        (ido-read-file-name): If command has ido property, don't use ido
+        if value is ignore, or read as directory if value is dir.
+        Set ido ignore property for dired-do-rename command.
 
 2004-05-04  Juanma Barranquero  <lektu@terra.es>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index f3aa96bb1e5..fbce94f2ecd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-04  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (Qtotal): New var.
+        (syms_of_xdisp): Intern and staticpro it.
+        (calc_line_height_property): New arg total.  Set it if
+        line-spacing property has format (total . VALUE).
+        (x_produce_glyphs): Ignore line-spacing if line-height is 0.
+        Handle total line-spacing property.
+
 2004-05-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear