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

4 files changed, 127 insertions, 58 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.
diff --git a/src/w32fns.c b/src/w32fns.c
index 3b53bade2ad..015b406db88 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8243,7 +8243,7 @@ x_put_x_image (f, ximg, pixmap, width, height)
  ***********************************************************************/
 
 static Lisp_Object x_find_image_file P_ ((Lisp_Object));
-static char *slurp_file P_ ((char *, int *));
+static unsigned char *slurp_file P_ ((char *, int *));
 
 
 /* Find image file FILE.  Look in data-directory, then
@@ -8279,13 +8279,13 @@ x_find_image_file (file)
    with xmalloc holding FILE's contents.  Value is null if an error
    occurred.  *SIZE is set to the size of the file.  */
 
-static char *
+static unsigned char *
 slurp_file (file, size)
      char *file;
      int *size;
 {
   FILE *fp = NULL;
-  char *buf = NULL;
+  unsigned char *buf = NULL;
   struct stat st;
 
   if (stat (file, &st) == 0
@@ -8316,13 +8316,13 @@ slurp_file (file, size)
                               XBM images
  ***********************************************************************/
 
-static int xbm_scan P_ ((char **, char *, char *, int *));
+static int xbm_scan P_ ((unsigned char **, unsigned char *, char *, int *));
 static int xbm_load P_ ((struct frame *f, struct image *img));
 static int xbm_load_image P_ ((struct frame *f, struct image *img,
-                               char *, char *));
+                               unsigned char *, unsigned char *));
 static int xbm_image_p P_ ((Lisp_Object object));
-static int xbm_read_bitmap_data P_ ((char *, char *, int *, int *,
-                                     unsigned char **));
+static int xbm_read_bitmap_data P_ ((unsigned char *, unsigned char *,
+                                     int *, int *, unsigned char **));
 static int xbm_file_p P_ ((Lisp_Object));
 
 
@@ -8511,11 +8511,11 @@ xbm_image_p (object)
 
 static int
 xbm_scan (s, end, sval, ival)
-     char **s, *end;
+     unsigned char **s, *end;
      char *sval;
      int *ival;
 {
-  int c;
+  unsigned int c;
 
  loop:
 
@@ -8645,11 +8645,11 @@ w32_create_pixmap_from_bitmap_data (int width, int height, char *data)
 
 static int
 xbm_read_bitmap_data (contents, end, width, height, data)
-     char *contents, *end;
+     unsigned char *contents, *end;
      int *width, *height;
      unsigned char **data;
 {
-  char *s = contents;
+  unsigned char *s = contents;
   char buffer[BUFSIZ];
   int padding_p = 0;
   int v10 = 0;
@@ -8827,7 +8827,7 @@ static int
 xbm_load_image (f, img, contents, end)
      struct frame *f;
      struct image *img;
-     char *contents, *end;
+     unsigned char *contents, *end;
 {
   int rc;
   unsigned char *data;
@@ -8915,7 +8915,7 @@ xbm_load (f, img)
   if (STRINGP (file_name))
     {
       Lisp_Object file;
-      char *contents;
+      unsigned char *contents;
       int size;
       struct gcpro gcpro1;
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 246b30549f6..67f21446320 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1900,10 +1900,14 @@ check_it (it)
       xassert (STRINGP (it->string));
       xassert (IT_STRING_CHARPOS (*it) >= 0);
     }
-  else if (it->method == next_element_from_buffer)
+  else
     {
-      /* Check that character and byte positions agree.  */
-      xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
+      xassert (IT_STRING_CHARPOS (*it) < 0);
+      if (it->method == next_element_from_buffer)
+        {
+          /* Check that character and byte positions agree.  */
+          xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
+        }
     }
 
   if (it->dpvec)
@@ -2016,6 +2020,8 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
   it->current.overlay_string_index = -1;
   it->current.dpvec_index = -1;
   it->base_face_id = base_face_id;
+  it->string = Qnil;
+  IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1;
 
   /* The window in which we iterate over current_buffer:  */
   XSETWINDOW (it->window, w);
@@ -3482,43 +3488,6 @@ handle_single_display_prop (it, prop, object, position,
         }
 #endif /* HAVE_WINDOW_SYSTEM */
     }
-  else if (CONSP (prop)
-           && (EQ (XCAR (prop), Qleft_fringe)
-               || EQ (XCAR (prop), Qright_fringe))
-           && CONSP (XCDR (prop)))
-    {
-      unsigned face_id = DEFAULT_FACE_ID;
-
-      /* `(left-fringe BITMAP FACE)'.  */
-      if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
-        return 0;
-
-#ifdef HAVE_WINDOW_SYSTEM
-      value = XCAR (XCDR (prop));
-      if (!NUMBERP (value)
-          || !valid_fringe_bitmap_id_p (XINT (value)))
-        return 0;
-
-      if (CONSP (XCDR (XCDR (prop))))
-        {
-          Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));
-          face_id = lookup_named_face (it->f, face_name, 'A');
-          if (face_id < 0)
-            return 0;
-        }
-
-      if (EQ (XCAR (prop), Qleft_fringe))
-        {
-          it->left_user_fringe_bitmap = XINT (value);
-          it->left_user_fringe_face_id = face_id;
-        }
-      else
-        {
-          it->right_user_fringe_bitmap = XINT (value);
-          it->right_user_fringe_face_id = face_id;
-        }
-#endif /* HAVE_WINDOW_SYSTEM */
-    }
   else if (!it->string_from_display_prop_p)
     {
       /* `((margin left-margin) VALUE)' or `((margin right-margin)
@@ -3537,6 +3506,64 @@ handle_single_display_prop (it, prop, object, position,
          text properties change there.  */
       it->stop_charpos = position->charpos;
 
+      if (CONSP (prop)
+          && (EQ (XCAR (prop), Qleft_fringe)
+              || EQ (XCAR (prop), Qright_fringe))
+          && CONSP (XCDR (prop)))
+        {
+          unsigned face_id = DEFAULT_FACE_ID;
+
+          /* Save current settings of IT so that we can restore them
+             when we are finished with the glyph property value.  */
+
+          /* `(left-fringe BITMAP FACE)'.  */
+          if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
+            return 0;
+
+#ifdef HAVE_WINDOW_SYSTEM
+          value = XCAR (XCDR (prop));
+          if (!NUMBERP (value)
+              || !valid_fringe_bitmap_id_p (XINT (value)))
+            return 0;
+
+          if (CONSP (XCDR (XCDR (prop))))
+            {
+              Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));
+
+              face_id = lookup_named_face (it->f, face_name, 'A');
+              if (face_id < 0)
+                return 0;
+            }
+
+          push_it (it);
+
+          it->area = TEXT_AREA;
+          it->what = IT_IMAGE;
+          it->image_id = -1; /* no image */
+          it->position = start_pos;
+          it->object = NILP (object) ? it->w->buffer : object;
+          it->method = next_element_from_image;
+          it->face_id = face_id;
+
+          /* Say that we haven't consumed the characters with
+             `display' property yet.  The call to pop_it in
+             set_iterator_to_next will clean this up.  */
+          *position = start_pos;
+
+          if (EQ (XCAR (prop), Qleft_fringe))
+            {
+              it->left_user_fringe_bitmap = XINT (value);
+              it->left_user_fringe_face_id = face_id;
+            }
+          else
+            {
+              it->right_user_fringe_bitmap = XINT (value);
+              it->right_user_fringe_face_id = face_id;
+            }
+#endif /* HAVE_WINDOW_SYSTEM */
+          return 1;
+        }
+
       location = Qunbound;
       if (CONSP (prop) && CONSP (XCAR (prop)))
         {
@@ -17673,17 +17700,31 @@ produce_image_glyph (it)
   xassert (it->what == IT_IMAGE);
 
   face = FACE_FROM_ID (it->f, it->face_id);
+  xassert (face);
+  /* Make sure X resources of the face is loaded.  */
+  PREPARE_FACE_FOR_DISPLAY (it->f, face);
+
+  if (it->image_id < 0)
+    {
+      /* Fringe bitmap.  */
+      it->nglyphs = 0;
+      return;
+    }
+
   img = IMAGE_FROM_ID (it->f, it->image_id);
   xassert (img);
-
-  /* Make sure X resources of the face and image are loaded.  */
-  PREPARE_FACE_FOR_DISPLAY (it->f, face);
+  /* Make sure X resources of the image is loaded.  */
   prepare_image_for_display (it->f, img);
 
   it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face);
   it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent;
   it->pixel_width = img->width + 2 * img->hmargin;
 
+  /* It's quite possible for images to have an ascent greater than
+     their height, so don't get confused in that case.  */
+  if (it->descent < 0)
+    it->descent = 0;
+
   /* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent.  */
   face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f);
   if (face_ascent > it->ascent)
diff --git a/src/xfns.c b/src/xfns.c
index a649ddd1068..5b3f8ffe552 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,5 +1,5 @@
 /* Functions for the X window system.
-   Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
+   Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000,01,02,03,04
      Free Software Foundation.
 
 This file is part of GNU Emacs.
@@ -5323,7 +5323,6 @@ lookup_image (f, spec)
         }
 
       UNBLOCK_INPUT;
-      xassert (!interrupt_input_blocked);
     }
 
   /* We're using IMG, so set its timestamp to `now'.  */