Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-262
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264
   Update from CVS: lispref/display.texi: emacs -> Emacs.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-266
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-267
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-156

1 files changed, 29 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 386c3d99a47..f8a9e5fb767 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2004-04-30  Kim F. Storm  <storm@cua.dk>
+
+        * buffer.c (syms_of_buffer) <line-spacing>: Allow float value.
+        (syms_of_buffer) <cursor-type>: Doc fix.
+
+        * dispextern.h (struct it): Remove member use_default_face.
+        Add members override_ascent, override_descent, override_boff.
+
+        * xdisp.c (init_iterator): Handle line-spacing float value.
+        Initialize override_ascent member.
+        (append_space_for_newline): Reset override_ascent.
+        Remove use_default_face.
+        (calc_line_height_property): New function to calculate value of
+        line-height and line-spacing properties.  Look at overlays, too.
+        Set override_ascent, override_descent, override_boff members when
+        using another face than the current face.  Float values are now
+        relative to the frame default font, by default; accept a cons
+        of ratio and face name to specify value relative to a specific face.
+        (x_produce_glyphs): Use calc_line_height_property.
+        Use override_ascent etc. when set to handle different face heights.
+        A negative line-spacing property value is interpreted as a total
+        line height, rather than inter-line spacing.
+        (note_mouse_highlight): Allocate room for 40 overlays initially.
+
+2004-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * data.c (Fsubr_name): New fun.
+        (syms_of_data): Defsubr it.
+
 2004-04-29  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (null_glyph_slice): New var.