# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1104429750 0
# Node ID 97d4823c4f087c91508bf48fb513de3bcf45af1d
# Parent  39392e7022678d2f1273ef9f5bf239547602186c
*** empty log message ***

diff -r 39392e702267 -r 97d4823c4f08 lispref/ChangeLog
--- a/lispref/ChangeLog	Thu Dec 30 18:01:59 2004 +0000
+++ b/lispref/ChangeLog	Thu Dec 30 18:02:30 2004 +0000
@@ -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 -r 39392e702267 -r 97d4823c4f08 src/ChangeLog
--- a/src/ChangeLog	Thu Dec 30 18:01:59 2004 +0000
+++ b/src/ChangeLog	Thu Dec 30 18:02:30 2004 +0000
@@ -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>