Sync up with XEmacs 21.4.17.

[chise/xemacs-chise.git.1] / src / redisplay-gtk.c

diff --git a/src/redisplay-gtk.c b/src/redisplay-gtk.c
index 967cf89..3e792de 100644 (file)
--- a/src/redisplay-gtk.c
+++ b/src/redisplay-gtk.c
@@ -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 ();
        }
     }