1 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 700f6c358cf..6a070bd69e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-27  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (Qline_height): New variable.
+        (syms_of_xdisp): Intern and staticpro it.
+        (append_space_for_newline): Partially undo 2004-04-25 change;
+        add default_face_p arg, and restore callers.
+        Clear it->use_default_face after use.
+        (x_produce_glyphs): Set default font for ascii char if
+        it->use_default_font is set.  Change line-spacing property to set
+        just extra line spacing.  Handle new line-height property.
+
 2004-04-26  Andreas Schwab  <schwab@suse.de>
 
         * print.c (print_object): Print non-ascii characters in bool
@@ -11,7 +22,7 @@
         * data.c (Faref, Faset): Likewise.
         * fns.c (Fcopy_sequence, concat, internal_equal, Ffillarray)
         (mapcar1): Likewise.
-        
+
 2004-04-26  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
 
         * lread.c (init_lread): Fixing typo HAVE_CARBON test logic