changeset 55170:a6568af3a29b

*** empty log message ***
author Kim F. Storm <storm@cua.dk>
date Mon, 26 Apr 2004 22:39:49 +0000
parents fb4f7c39404d
children 435f2f5f8d84
files etc/NEWS lisp/ChangeLog src/ChangeLog
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/etc/NEWS	Mon Apr 26 22:39:21 2004 +0000
+++ b/etc/NEWS	Mon Apr 26 22:39:49 2004 +0000
@@ -2003,7 +2003,7 @@
 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
--- a/lisp/ChangeLog	Mon Apr 26 22:39:21 2004 +0000
+++ b/lisp/ChangeLog	Mon Apr 26 22:39:49 2004 +0000
@@ -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
--- a/src/ChangeLog	Mon Apr 26 22:39:21 2004 +0000
+++ b/src/ChangeLog	Mon Apr 26 22:39:49 2004 +0000
@@ -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;