*** empty log message ***

3 files changed, 8 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index f04ff88f2bd..55366d09525 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2003,7 +2003,7 @@ specifies the minimum line height in pixels.  If necessary, the line
 height it increased by increasing the line's ascent.
 
 If the line-height property value is a float, the minimum line height
-is calculated by multiplying the current height of the display row by
+is calculated by multiplying the height of the current face font by
 the given value.
 
 If the line-height property value is t, the minimum line height is
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cba61f06c91..a364d8e27d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-27  Kim F. Storm  <storm@cua.dk>
+
+        * image.el (insert-sliced-image): Use line-height instead of
+        line-spacing property on newline.
+
 2004-04-26  Lars Hansen  <larsh@math.ku.dk>
 
         * desktop.el (desktop-buffer-misc-data-function): Rename to
diff --git a/src/ChangeLog b/src/ChangeLog
index 6a070bd69e4..568cfa113c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-27  Kim F. Storm  <storm@cua.dk>
 
+        * dispextern.h (struct it): New member use_default_face.
+
         * xdisp.c (Qline_height): New variable.
         (syms_of_xdisp): Intern and staticpro it.
         (append_space_for_newline): Partially undo 2004-04-25 change;