2004-02-11  Miles Bader  <address@hidden>

	* xdisp.c (produce_image_glyph): Force negative descents to zero.

--- orig/src/xdisp.c
+++ mod/src/xdisp.c
@@ -17827,6 +17827,11 @@
   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)