*** empty log message ***

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7ed6bea903e48bc6dc47aa8f93463700db029982..c245d26870de0f5fe915f3f8aff8b6b3217a0a41 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-30  Kim F. Storm  <storm@cua.dk>
+
+       * display.texi (Line Height): Total line-height is now specified
+       in line-height property of form (HEIGHT TOTAL).  Swap (FACE . RATIO)
+       in cons cells.  (nil . RATIO) is relative to actual line height.
+       Use line-height `t' instead of `0' to get minimum height.
+
 2004-12-29  Richard M. Stallman  <rms@gnu.org>
 
        * os.texi (Timers): Discuss timers vs editing the buffer and undo.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b6264a3295ca86b26eb7045afdab4bf47f792e1..d7de3c33be2c3006f9fa94b4f0cb0db99a618801 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,7 +6,7 @@
        (x_produce_glyphs): Use them to handle line-height and
        line-spacing according to new height spec.
        (Qtotal): Remove.
-       (syms_of_xdisp): Remove defsubr and intern for Qtotal.
+       (syms_of_xdisp): Remove intern and staticpro for Qtotal.
 
 2004-12-30  Kenichi Handa  <handa@m17n.org>