Mercurial > hg > xemacs-beta

diff src/redisplay-output.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents f87be7ddd60d
children b0d712bbc2a6
line wrap: on
line diff
--- a/src/redisplay-output.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/redisplay-output.c	Sun Oct 09 09:51:57 2011 +0100
@@ -988,7 +988,7 @@
     {
       w->last_point_x[CURRENT_DISP] = x;
       w->last_point_y[CURRENT_DISP] = y;
-      Fset_marker (w->last_point[CURRENT_DISP], make_int (ADJ_CHARPOS),
+      Fset_marker (w->last_point[CURRENT_DISP], make_fixnum (ADJ_CHARPOS),
 		   w->buffer);
       dl->cursor_elt = x;
       return 1;
@@ -1099,7 +1099,7 @@
 		  w->last_point_x[CURRENT_DISP] = cur_rb;
 		  w->last_point_y[CURRENT_DISP] = cur_dl;
 		  Fset_marker (w->last_point[CURRENT_DISP],
-			       make_int (ADJ_CHARPOS), w->buffer);
+			       make_fixnum (ADJ_CHARPOS), w->buffer);
 
 		  if (!no_output_end)
 		    {
@@ -1474,13 +1474,13 @@
 	    style = EDGE_ETCHED_OUT;
 	  else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qbevel_in))
 	    style = EDGE_BEVEL_IN;
-	  else if (INTP (IMAGE_INSTANCE_LAYOUT_BORDER (p)))
+	  else if (FIXNUMP (IMAGE_INSTANCE_LAYOUT_BORDER (p)))
 	    {
 	      style = EDGE_ETCHED_IN;
 	      if (edges & EDGE_TOP)
 		{
-		  ypos += XINT (IMAGE_INSTANCE_LAYOUT_BORDER (p));
-		  height -= XINT (IMAGE_INSTANCE_LAYOUT_BORDER (p));
+		  ypos += XFIXNUM (IMAGE_INSTANCE_LAYOUT_BORDER (p));
+		  height -= XFIXNUM (IMAGE_INSTANCE_LAYOUT_BORDER (p));
 		}
 	    }
 	  else
@@ -2498,10 +2498,10 @@
 
   w->window_end_pos[CURRENT_DISP] = w->window_end_pos[DESIRED_DISP];
   Fset_marker (w->start[CURRENT_DISP],
-	       make_int (marker_position (w->start[DESIRED_DISP])),
+	       make_fixnum (marker_position (w->start[DESIRED_DISP])),
 	       w->buffer);
   Fset_marker (w->pointm[CURRENT_DISP],
-	       make_int (marker_position (w->pointm[DESIRED_DISP])),
+	       make_fixnum (marker_position (w->pointm[DESIRED_DISP])),
 	       w->buffer);
   w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP];
   w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP];
@@ -2641,10 +2641,10 @@
 {
   assert (!in_display);
   redisplay_redraw_exposed_area (XFRAME (X1ST (arg)),
-				 XINT (X2ND (arg)),
-				 XINT (X3RD (arg)),
-				 XINT (X4TH (arg)),
-				 XINT (X5TH (arg)));
+				 XFIXNUM (X2ND (arg)),
+				 XFIXNUM (X3RD (arg)),
+				 XFIXNUM (X4TH (arg)),
+				 XFIXNUM (X5TH (arg)));
   free_list (arg);
 }
 
@@ -2664,9 +2664,9 @@
     {
       /* Not safe to do it now, so delay it */
       register_post_redisplay_action (redisplay_redraw_exposed_area_1,
-				      list5 (wrap_frame (f), make_int (x),
-					     make_int (y), make_int (width),
-					     make_int (height)));
+				      list5 (wrap_frame (f), make_fixnum (x),
+					     make_fixnum (y), make_fixnum (width),
+					     make_fixnum (height)));
       return;
     }
 
@@ -2718,7 +2718,7 @@
   y = dl->ypos - dl->ascent - shadow_thickness;
   height = dl->ascent + dl->descent + 2 * shadow_thickness;
 
-  if (XINT (w->modeline_shadow_thickness) < 0)
+  if (XFIXNUM (w->modeline_shadow_thickness) < 0)
     {
       style = EDGE_BEVEL_IN;
     }