X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-gtk.c;h=7560803738ef0130dc7b1909a147c044900b0e07;hb=e74333c5d075dd86f8440cda18a2c68410bdd432;hp=967cf8999ec8c3f0a1f9e35b1196157755b53a64;hpb=21db8709c0c2dcedbd278c7fe571290d5ce80a71;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-gtk.c b/src/redisplay-gtk.c
index 967cf89..7560803 100644
--- a/src/redisplay-gtk.c
+++ b/src/redisplay-gtk.c
@@ -294,7 +294,7 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 			  int cursor_width, int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Emchar_dynarr *buf;
   Lisp_Object window;
 
   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -326,7 +326,7 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 
   if (end < 0)
     end = Dynarr_length (rba);
-  Dynarr_reset (buf);
+  buf = Dynarr_new (Emchar);
 
   while (elt < end)
     {
@@ -421,8 +421,8 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 	      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);
 	      instance = glyph_image_instance (rb->object.dglyph.glyph,
@@ -460,7 +460,7 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 		    break;
 
 		  case IMAGE_POINTER:
-		    abort ();
+		    ABORT ();
 
 		  case IMAGE_WIDGET:
 		      if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
@@ -484,14 +484,14 @@ gtk_output_display_block (struct window *w, struct display_line *dl, int block,
 		    break;
 
 		  default:
-		    abort ();
+		    ABORT ();
 		  }
 
 	      xpos += rb->width;
 	      elt++;
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
     }