X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-x.c;h=f2acc68f4d3a3ad3b60e9630422c5668976deb14;hb=c17cfefd00f49430bd139e11bfc580734091d728;hp=e218fe5c17aeaebdc71bf52a019b25ec70370723;hpb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index e218fe5..f2acc68 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -327,7 +327,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);
-  Charc_dynarr *buf = Dynarr_new (Charc);
+  Charc_dynarr *buf;
   Lisp_Object window;
 
   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -354,7 +354,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 (Charc);
 
   while (elt < end)
     {
@@ -492,7 +492,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;
@@ -502,7 +502,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	      elt++;
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
     }
 
@@ -982,8 +982,9 @@ x_output_string (struct window *w, struct display_line *dl,
       /* We draw underlines in the same color as the text. */
       if (cachel->underline)
 	{
-	  long upos;
-	  long 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));
@@ -1011,7 +1012,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));