Mercurial > hg > xemacs-beta

diff src/gutter.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 308d34e9f07d
children 77d7b77909c2
line wrap: on
line diff
--- a/src/gutter.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/gutter.c	Sun Oct 09 09:51:57 2011 +0100
@@ -340,7 +340,7 @@
       /* Let GC happen again. */
       exit_redisplay_critical_section (count);
 
-      ret = make_int (calculate_gutter_size_from_display_lines (pos, ddla));
+      ret = make_fixnum (calculate_gutter_size_from_display_lines (pos, ddla));
       free_display_lines (ddla);
     }
 
@@ -776,7 +776,7 @@
   get_gutter_coords (f, p, &x, &y, &width, &height);
   width -= (FRAME_GUTTER_BORDER_WIDTH (f, p) * 2);
 
-  return make_int (width);
+  return make_fixnum (width);
 }
 
 DEFUN ("gutter-pixel-height", Fgutter_pixel_height, 0, 2, 0, /*
@@ -797,7 +797,7 @@
   get_gutter_coords (f, p, &x, &y, &width, &height);
   height -= (FRAME_GUTTER_BORDER_WIDTH (f, p) * 2);
 
-  return make_int (height);
+  return make_fixnum (height);
 }
 
 DEFINE_SPECIFIER_TYPE (gutter);
@@ -862,7 +862,7 @@
 gutter_specs_changed_1 (Lisp_Object arg)
 {
   gutter_specs_changed (X1ST (arg), XWINDOW (X2ND (arg)),
-			X3RD (arg), (enum edge_pos) XINT (X4TH (arg)));
+			X3RD (arg), (enum edge_pos) XFIXNUM (X4TH (arg)));
   free_list (arg);
 }
 
@@ -873,7 +873,7 @@
   if (in_display)
     register_post_redisplay_action (gutter_specs_changed_1,
 				    list4 (specifier, wrap_window (w),
-					   oldval, make_int (pos)));
+					   oldval, make_fixnum (pos)));
   else
     {
       w->real_gutter[pos] = construct_window_gutter_spec (w, pos);
@@ -1004,7 +1004,7 @@
   if (NILP (instantiator))
     return;
 
-  if (!INTP (instantiator) && !EQ (instantiator, Qautodetect))
+  if (!FIXNUMP (instantiator) && !EQ (instantiator, Qautodetect))
     invalid_argument ("Gutter size must be an integer or `autodetect'", instantiator);
 }
 
@@ -1527,11 +1527,11 @@
   fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
 #endif
 #ifdef HAVE_X_WINDOWS
-  fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_GUTTER_BORDER_WIDTH)), fb);
+  fb = Fcons (Fcons (list1 (Qx), make_fixnum (DEFAULT_GUTTER_BORDER_WIDTH)), fb);
 #endif
 #ifdef HAVE_MS_WINDOWS
   fb = Fcons (Fcons (list1 (Qmsprinter), Qzero), fb);
-  fb = Fcons (Fcons (list1 (Qmswindows), make_int (DEFAULT_GUTTER_BORDER_WIDTH)), fb);
+  fb = Fcons (Fcons (list1 (Qmswindows), make_fixnum (DEFAULT_GUTTER_BORDER_WIDTH)), fb);
 #endif
   if (!NILP (fb))
     set_specifier_fallback (Vdefault_gutter_border_width, fb);