X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fredisplay-x.c;h=edd910915916cd5a176defda9bc281ce011d8a03;hp=ff49eb54a251d21650b2759415fa232a91501511;hb=ee38d21b330f5001b47a577cefb5ba7b82a3b7d3;hpb=79d2db7d65205bc85d471590726d0cf3af5598e0

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index ff49eb5..edd9109 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -482,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;
@@ -492,7 +492,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 	      elt++;
 	    }
 	  else
-	    abort ();
+	    ABORT ();
 	}
     }
 
@@ -972,8 +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;
-	  unsigned 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));
@@ -1001,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));