Mercurial > hg > xemacs-beta

comparison src/file-coding.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 4dee0387b9de
children dae33b5feffe
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
465 { 465 {
466 /* It's okay to call Lisp here, the only non-stack object we may have 466 /* It's okay to call Lisp here, the only non-stack object we may have
467 allocated up to this point is safe_chars, and that's 467 allocated up to this point is safe_chars, and that's
468 reachable from its entry in 468 reachable from its entry in
469 Vdefault_query_coding_region_chartab_cache */ 469 Vdefault_query_coding_region_chartab_cache */
470 call3 (Qquery_coding_clear_highlights, make_int (pos), make_int (end), 470 call3 (Qquery_coding_clear_highlights, make_fixnum (pos), make_fixnum (end),
471 wrap_buffer (buf)); 471 wrap_buffer (buf));
472 } 472 }
473 473
474 while (pos < end) 474 while (pos < end)
475 { 475 {
519 result = Fmake_range_table (Qstart_closed_end_open); 519 result = Fmake_range_table (Qstart_closed_end_open);
520 } 520 }
521 521
522 fail_range_end = pos; 522 fail_range_end = pos;
523 523
524 Fput_range_table (make_int (fail_range_start), 524 Fput_range_table (make_fixnum (fail_range_start),
525 make_int (fail_range_end), 525 make_fixnum (fail_range_end),
526 Qunencodable, 526 Qunencodable,
527 result); 527 result);
528 previous_failed_reason = query_coding_succeeded; 528 previous_failed_reason = query_coding_succeeded;
529 529
530 if (flags & QUERY_METHOD_HIGHLIGHT) 530 if (flags & QUERY_METHOD_HIGHLIGHT)
531 { 531 {
532 Lisp_Object extent 532 Lisp_Object extent
533 = Fmake_extent (make_int (fail_range_start), 533 = Fmake_extent (make_fixnum (fail_range_start),
534 make_int (fail_range_end), 534 make_fixnum (fail_range_end),
535 wrap_buffer (buf)); 535 wrap_buffer (buf));
536 536
537 Fset_extent_priority 537 Fset_extent_priority
538 (extent, make_int (2 + mouse_highlight_priority)); 538 (extent, make_fixnum (2 + mouse_highlight_priority));
539 Fset_extent_face (extent, Qquery_coding_warning_face); 539 Fset_extent_face (extent, Qquery_coding_warning_face);
540 } 540 }
541 } 541 }
542 } 542 }
543 } 543 }
2297 if (!NILP (to_outstream)) 2297 if (!NILP (to_outstream))
2298 Lstream_delete (XLSTREAM (to_outstream)); 2298 Lstream_delete (XLSTREAM (to_outstream));
2299 if (!NILP (auto_outstream)) 2299 if (!NILP (auto_outstream))
2300 Lstream_delete (XLSTREAM (auto_outstream)); 2300 Lstream_delete (XLSTREAM (auto_outstream));
2301 Lstream_delete (XLSTREAM (lb_outstream)); 2301 Lstream_delete (XLSTREAM (lb_outstream));
2302 return make_int (retlen); 2302 return make_fixnum (retlen);
2303 } 2303 }
2304 } 2304 }
2305 2305
2306 DEFUN ("decode-coding-region", Fdecode_coding_region, 3, 4, 2306 DEFUN ("decode-coding-region", Fdecode_coding_region, 3, 4,
2307 "*r\nzDecode from coding system: \ni", /* 2307 "*r\nzDecode from coding system: \ni", /*
4291 4291
4292 write_ascstring (printcharfun, "("); 4292 write_ascstring (printcharfun, "(");
4293 if (data->level == -1) 4293 if (data->level == -1)
4294 write_ascstring (printcharfun, "default"); 4294 write_ascstring (printcharfun, "default");
4295 else 4295 else
4296 print_internal (make_int (data->level), printcharfun, 0); 4296 print_internal (make_fixnum (data->level), printcharfun, 0);
4297 write_ascstring (printcharfun, ")"); 4297 write_ascstring (printcharfun, ")");
4298 } 4298 }
4299 4299
4300 static int 4300 static int
4301 gzip_putprop (Lisp_Object codesys, Lisp_Object key, Lisp_Object value) 4301 gzip_putprop (Lisp_Object codesys, Lisp_Object key, Lisp_Object value)
4306 { 4306 {
4307 if (EQ (value, Qdefault)) 4307 if (EQ (value, Qdefault))
4308 data->level = -1; 4308 data->level = -1;
4309 else 4309 else
4310 { 4310 {
4311 check_integer_range (value, Qzero, make_int (9)); 4311 check_integer_range (value, Qzero, make_fixnum (9));
4312 data->level = XINT (value); 4312 data->level = XFIXNUM (value);
4313 } 4313 }
4314 } 4314 }
4315 else 4315 else
4316 return 0; 4316 return 0;
4317 return 1; 4317 return 1;
4325 4325
4326 if (EQ (prop, Qlevel)) 4326 if (EQ (prop, Qlevel))
4327 { 4327 {
4328 if (data->level == -1) 4328 if (data->level == -1)
4329 return Qdefault; 4329 return Qdefault;
4330 return make_int (data->level); 4330 return make_fixnum (data->level);
4331 } 4331 }
4332 4332
4333 return Qunbound; 4333 return Qunbound;
4334 } 4334 }
4335 4335