Mercurial > hg > xemacs-beta

comparison src/fontcolor-x.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 15b0715c204d
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
177 177
178 static Lisp_Object 178 static Lisp_Object
179 x_color_instance_rgb_components (Lisp_Color_Instance *c) 179 x_color_instance_rgb_components (Lisp_Color_Instance *c)
180 { 180 {
181 XColor color = COLOR_INSTANCE_X_COLOR (c); 181 XColor color = COLOR_INSTANCE_X_COLOR (c);
182 return (list3 (make_int (color.red), 182 return (list3 (make_fixnum (color.red),
183 make_int (color.green), 183 make_fixnum (color.green),
184 make_int (color.blue))); 184 make_fixnum (color.blue)));
185 } 185 }
186 186
187 static int 187 static int
188 x_valid_color_name_p (struct device *d, Lisp_Object color) 188 x_valid_color_name_p (struct device *d, Lisp_Object color)
189 { 189 {
860 860
861 value = (val_str ? build_extstring (val_str, Qx_atom_name_encoding) 861 value = (val_str ? build_extstring (val_str, Qx_atom_name_encoding)
862 : Qnil); 862 : Qnil);
863 } 863 }
864 else 864 else
865 value = make_int (props [i].card32); 865 value = make_fixnum (props [i].card32);
866 if (namestrext) XFree (namestrext); 866 if (namestrext) XFree (namestrext);
867 result = Fcons (Fcons (name, value), result); 867 result = Fcons (Fcons (name, value), result);
868 } 868 }
869 return result; 869 return result;
870 } 870 }
878 Lisp_Object result = Qnil; 878 Lisp_Object result = Qnil;
879 const Extbyte *patternext; 879 const Extbyte *patternext;
880 880
881 patternext = LISP_STRING_TO_EXTERNAL (pattern, Qx_font_name_encoding); 881 patternext = LISP_STRING_TO_EXTERNAL (pattern, Qx_font_name_encoding);
882 882
883 if (!NILP(maxnumber) && INTP(maxnumber)) 883 if (!NILP(maxnumber) && FIXNUMP(maxnumber))
884 { 884 {
885 max_number = XINT(maxnumber); 885 max_number = XFIXNUM(maxnumber);
886 } 886 }
887 887
888 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)), 888 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
889 patternext, max_number, &count); 889 patternext, max_number, &count);
890 while (count--) 890 while (count--)