Merged in changes from CVS HEAD

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-114
   Merge some minor redisplay bug-fixes from emacs--tiling--0

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

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-9
   Remove bogus xassert

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-10
   Avoid negative descents for images with ascent > height

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-13
   Fix iterator-inconsistency bug in redisplay


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

1 files changed, 29 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a2f7f4e20b..ddd92927a17 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2004-02-26  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (handle_single_display_prop): Handle left-fringe and
+        right-fringe similar to a display margin image.  Specifically,
+        the characters having the fringe prop are no longer shown, and
+        we use IT_IMAGE/next_element_from_image with image_id = -1 to
+        do this.  Set fringe bitmap face_id in it->face_id.
+        (produce_image_glyph): Handle image_id < 0 as "no image" case, but
+        still realize it->face (i.e. the fringe bitmap face).
+
+2004-02-25  Miles Bader  <miles@gnu.org>
+
+        * xdisp.c (check_it): Check string/string_pos consistency.
+        (init_iterator): Initialize string-related fields properly.
+
+2004-02-11  Miles Bader  <miles@gnu.org>
+
+        * xdisp.c (produce_image_glyph): Force negative descents to zero.
+
+2004-02-10  Miles Bader  <miles@gnu.org>
+
+        * xfns.c (lookup_image): Remove xassert(!interrupt_input_blocked);
+        BLOCK_INPUT can be nested, so it doesn't make much sense.
+
+2004-02-24  Michael Mauger <mmaug@yahoo.com>
+
+        * w32fns.c (slurp_file, xbm_scan, xbm_load_image)
+        (xbm_read_bitmap_data): Use unsigned char for image data.
+
 2004-02-23  Luc Teirlinck  <teirllm@auburn.edu>
 
         * abbrev.c (Finsert_abbrev_table_description): Doc fix.