Mercurial > hg > xemacs-beta

diff src/redisplay-xlike-inc.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 580ef98f2beb
children 444713e89160
line wrap: on
line diff
--- a/src/redisplay-xlike-inc.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/redisplay-xlike-inc.c	Sun Oct 09 09:51:57 2011 +0100
@@ -857,7 +857,7 @@
     }
 
   /* evil kludge! */
-  if (!NILP (fg) && !COLOR_INSTANCEP (fg) && !INTP (fg))
+  if (!NILP (fg) && !COLOR_INSTANCEP (fg) && !FIXNUMP (fg))
     {
       /* #### I fixed one case where this was getting hit.  It was a
          bad macro expansion (compiler bug). */
@@ -871,7 +871,7 @@
       if (COLOR_INSTANCEP (fg))
 	XLIKE_SET_GC_COLOR (gcv.foreground, XCOLOR_INSTANCE_XLIKE_COLOR (fg));
       else
-	XLIKE_SET_GC_PIXEL (gcv.foreground, XINT (fg));
+	XLIKE_SET_GC_PIXEL (gcv.foreground, XFIXNUM (fg));
       mask |= XLIKE_GC_FOREGROUND;
     }
 
@@ -880,7 +880,7 @@
       if (COLOR_INSTANCEP (bg))
 	XLIKE_SET_GC_COLOR (gcv.background, XCOLOR_INSTANCE_XLIKE_COLOR (bg));
       else
-	XLIKE_SET_GC_PIXEL (gcv.background, XINT (bg));
+	XLIKE_SET_GC_PIXEL (gcv.background, XFIXNUM (bg));
       mask |= XLIKE_GC_BACKGROUND;
     }
 
@@ -927,7 +927,7 @@
 
   if (!NILP (lwidth))
     {
-      gcv.line_width = XINT (lwidth);
+      gcv.line_width = XFIXNUM (lwidth);
       mask |= XLIKE_GC_LINE_WIDTH;
     }
 
@@ -1554,7 +1554,7 @@
 	{
 	  gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, Qnil,
 			     Qnil, Qnil,
-			     make_int (bar_width));
+			     make_fixnum (bar_width));
 	}
       else
 	{
@@ -1787,9 +1787,9 @@
     get_builtin_face_cache_index (w, Vvertical_divider_face);
 
   width = window_divider_width (w);
-  shadow_thickness = XINT (w->vertical_divider_shadow_thickness);
-  spacing = XINT (w->vertical_divider_spacing);
-  line_width = XINT (w->vertical_divider_line_width);
+  shadow_thickness = XFIXNUM (w->vertical_divider_shadow_thickness);
+  spacing = XFIXNUM (w->vertical_divider_spacing);
+  line_width = XFIXNUM (w->vertical_divider_line_width);
   x = WINDOW_RIGHT (w) - width;
   ytop = WINDOW_TOP (w);
   ybottom = WINDOW_BOTTOM (w);
@@ -1940,7 +1940,7 @@
 
 	      gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background,
 				 Qnil, Qnil, Qnil,
-				 make_int (bar_width));
+				 make_fixnum (bar_width));
 	      XLIKE_DRAW_LINE (dpy, x_win, gc, cursor_start + bar_width - 1,
 			       cursor_y, cursor_start + bar_width - 1,
 			       cursor_y + cursor_height - 1);
@@ -2108,7 +2108,7 @@
 
 	  gc = XLIKE_get_gc (f, Qnil, cursor_cachel->background, Qnil,
 			     Qnil, Qnil,
-			     make_int (bar_width));
+			     make_fixnum (bar_width));
 	  XLIKE_DRAW_LINE (dpy, x_win, gc, x + bar_width - 1, cursor_y,
 			   x + bar_width - 1, cursor_y + cursor_height - 1);
 	}