Mercurial > hg > xemacs-beta

comparison src/select-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 79e9934779c1
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
976 speccount = specpdl_depth (); 976 speccount = specpdl_depth ();
977 977
978 /* add a timeout handler */ 978 /* add a timeout handler */
979 if (x_selection_timeout > 0) 979 if (x_selection_timeout > 0)
980 { 980 {
981 Lisp_Object id = Fadd_timeout (make_int (x_selection_timeout), 981 Lisp_Object id = Fadd_timeout (make_fixnum (x_selection_timeout),
982 Qx_selection_reply_timeout_internal, 982 Qx_selection_reply_timeout_internal,
983 Qnil, Qnil); 983 Qnil, Qnil);
984 record_unwind_protect (Fdisable_timeout, id); 984 record_unwind_protect (Fdisable_timeout, id);
985 } 985 }
986 986
1360 if (!data) return Qnil; 1360 if (!data) return Qnil;
1361 1361
1362 if (format != 8 || type != XA_STRING) 1362 if (format != 8 || type != XA_STRING)
1363 invalid_state_2 ("Cut buffer doesn't contain 8-bit STRING data", 1363 invalid_state_2 ("Cut buffer doesn't contain 8-bit STRING data",
1364 x_atom_to_symbol (d, type), 1364 x_atom_to_symbol (d, type),
1365 make_int (format)); 1365 make_fixnum (format));
1366 1366
1367 /* We cheat - if the string contains an ESC character, that's 1367 /* We cheat - if the string contains an ESC character, that's
1368 technically not allowed in a STRING, so we assume it's 1368 technically not allowed in a STRING, so we assume it's
1369 COMPOUND_TEXT that we stored there ourselves earlier, 1369 COMPOUND_TEXT that we stored there ourselves earlier,
1370 in x-store-cutbuffer-internal */ 1370 in x-store-cutbuffer-internal */
1465 struct device *d = decode_x_device (Qnil); 1465 struct device *d = decode_x_device (Qnil);
1466 Display *display = DEVICE_X_DISPLAY (d); 1466 Display *display = DEVICE_X_DISPLAY (d);
1467 Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */ 1467 Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */
1468 Atom props [8]; 1468 Atom props [8];
1469 1469
1470 CHECK_INT (n); 1470 CHECK_FIXNUM (n);
1471 if (XINT (n) == 0) 1471 if (XFIXNUM (n) == 0)
1472 return n; 1472 return n;
1473 if (! cut_buffers_initialized) 1473 if (! cut_buffers_initialized)
1474 initialize_cut_buffers (display, window); 1474 initialize_cut_buffers (display, window);
1475 props[0] = XA_CUT_BUFFER0; 1475 props[0] = XA_CUT_BUFFER0;
1476 props[1] = XA_CUT_BUFFER1; 1476 props[1] = XA_CUT_BUFFER1;
1478 props[3] = XA_CUT_BUFFER3; 1478 props[3] = XA_CUT_BUFFER3;
1479 props[4] = XA_CUT_BUFFER4; 1479 props[4] = XA_CUT_BUFFER4;
1480 props[5] = XA_CUT_BUFFER5; 1480 props[5] = XA_CUT_BUFFER5;
1481 props[6] = XA_CUT_BUFFER6; 1481 props[6] = XA_CUT_BUFFER6;
1482 props[7] = XA_CUT_BUFFER7; 1482 props[7] = XA_CUT_BUFFER7;
1483 XRotateWindowProperties (display, window, props, 8, XINT (n)); 1483 XRotateWindowProperties (display, window, props, 8, XFIXNUM (n));
1484 return n; 1484 return n;
1485 } 1485 }
1486 1486
1487 #endif /* CUT_BUFFER_SUPPORT */ 1487 #endif /* CUT_BUFFER_SUPPORT */
1488 1488