X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fredisplay-x.c;h=d74bb3ea4dc34c9a80f818cc7afb300e393224e2;hb=dbf2768f7b146e97e37a27316f70bb313f1acf15;hp=d55a7982dadd448518b735174a64452e7d4593ad;hpb=042cabb13b0419d8aa5cfac9e087d78730d1dbc7;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index d55a798..d74bb3e 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -439,11 +439,12 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	      Lisp_Object instance;
 	      struct display_box dbox;
 	      struct display_glyph_area dga;
+
 	      redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
-						 start_pixpos, rb->width,
-						 &dbox, &dga);
+						 rb->object.dglyph.yoffset, start_pixpos,
+                                                 rb->width, &dbox, &dga);
 
-	      XSETWINDOW (window, w);
+              XSETWINDOW (window, w);
 	      instance = glyph_image_instance (rb->object.dglyph.glyph,
 					       window, ERROR_ME_NOT, 1);
 	      findex = rb->findex;
@@ -971,7 +972,8 @@ x_output_string (struct window *w, struct display_line *dl,
       /* We draw underlines in the same color as the text. */
       if (cachel->underline)
 	{
-	  unsigned long upos, uthick;
+	  long upos;
+	  long uthick;
 	  XFontStruct *xfont;
 
 	  xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));