# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1104429703 0
# Node ID 2c1e7ea9063eda965d01a2d0baab07b8563fea21
# Parent  d928e34db52a4a8a7cd52d94b5b256d5b9ed69bf
*** empty log message ***

diff -r d928e34db52a -r 2c1e7ea9063e src/ChangeLog
--- a/src/ChangeLog	Thu Dec 30 18:01:16 2004 +0000
+++ b/src/ChangeLog	Thu Dec 30 18:01:43 2004 +0000
@@ -1,3 +1,13 @@
+2004-12-30  Kim F. Storm  <storm@cua.dk>
+
+	* xdisp.c (get_line_height_property): New function extracted from
+	original calc_line_height_property.
+	(calc_line_height_property): Rework.  Handle t and (nil . ratio).
+	(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.
+
 2004-12-30  Kenichi Handa  <handa@m17n.org>
 
 	* fileio.c (Finsert_file_contents): Don't use