XEmacs 21.4.20 "Double Solitaire".

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

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index d55a798..daf3c27 100644 (file)
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -318,7 +318,7 @@ x_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);
@@ -345,7 +345,7 @@ x_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)
     {
@@ -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;
@@ -481,7 +482,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
                    case IMAGE_TEXT:
                    case IMAGE_POINTER:
                    default:
-                     abort ();
+                     ABORT ();
                    }
                  IMAGE_INSTANCE_OPTIMIZE_OUTPUT
                    (XIMAGE_INSTANCE (instance)) = 0;
@@ -491,7 +492,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
              elt++;
            }
          else
-           abort ();
+           ABORT ();
        }
     }
 
@@ -971,7 +972,9 @@ 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;
+         /* upos is naturally signed, why would anyone think otherwise?
+            uthick is signed to avoid unsigned propagation. */
+         long upos, uthick;
          XFontStruct *xfont;
 
          xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
@@ -999,7 +1002,9 @@ x_output_string (struct window *w, struct display_line *dl,
        }
 
       if (cachel->strikethru) {
-       unsigned long ascent,descent,upos, uthick;
+       /* ascent, descent, and upos are naturally signed; why would anyone
+          think otherwise?  uthick is signed to avoid unsigned propagation. */
+       long ascent, descent, upos, uthick;
        XFontStruct *xfont;
 
        xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));