aboutsummaryrefslogtreecommitdiffstats
path: root/src/casefiddle.c
diff options
context:
space:
mode:
authorTom Tromey2018-07-06 21:56:17 -0600
committerTom Tromey2018-07-12 22:12:27 -0600
commit42fe787b0f26c2df682b2797407a669ef8522ccb (patch)
treee944fe465e2b65703a8361bc82647faf4f7907f1 /src/casefiddle.c
parent01dbf2a347944497fdcf2ec156f4605020d7ba2a (diff)
downloademacs-42fe787b0f26c2df682b2797407a669ef8522ccb.tar.gz
emacs-42fe787b0f26c2df682b2797407a669ef8522ccb.zip
Rename integerp->fixnum, etc, in preparation for bignums
* src/json.c, src/keyboard.c, src/keyboard.h, src/keymap.c, src/kqueue.c, src/lcms.c, src/lisp.h, src/lread.c, src/macros.c, src/marker.c, src/menu.c, src/minibuf.c, src/msdos.c, src/print.c, src/process.c, src/profiler.c, src/search.c, src/sound.c, src/syntax.c, src/sysdep.c, src/term.c, src/terminal.c, src/textprop.c, src/undo.c, src/w16select.c, src/w32.c, src/w32console.c, src/w32cygwinx.c, src/w32fns.c, src/w32font.c, src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c, src/w32uniscribe.c, src/widget.c, src/window.c, src/xdisp.c, src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xrdb.c, src/xselect.c, src/xterm.c, src/xwidget.c: Rename INTEGERP->FIXNUM, make_number->make_fixnum, CHECK_NUMBER->CHECK_FIXNUM, make_natnum->make_fixed_natum, NUMBERP->FIXED_OR_FLOATP, NATNUMP->FIXNATP, CHECK_NATNUM->CHECK_FIXNAT.
Diffstat (limited to 'src/casefiddle.c')
-rw-r--r--src/casefiddle.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 8befc5ae7c6..a6656b1e683 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -250,7 +250,7 @@ do_casify_natnum (struct casing_context *ctx, Lisp_Object obj)
250 250
251 if (! multibyte) 251 if (! multibyte)
252 MAKE_CHAR_UNIBYTE (cased); 252 MAKE_CHAR_UNIBYTE (cased);
253 return make_natnum (cased | flags); 253 return make_fixed_natnum (cased | flags);
254} 254}
255 255
256static Lisp_Object 256static Lisp_Object
@@ -319,7 +319,7 @@ casify_object (enum case_action flag, Lisp_Object obj)
319 struct casing_context ctx; 319 struct casing_context ctx;
320 prepare_casing_context (&ctx, flag, false); 320 prepare_casing_context (&ctx, flag, false);
321 321
322 if (NATNUMP (obj)) 322 if (FIXNATP (obj))
323 return do_casify_natnum (&ctx, obj); 323 return do_casify_natnum (&ctx, obj);
324 else if (!STRINGP (obj)) 324 else if (!STRINGP (obj))
325 wrong_type_argument (Qchar_or_string_p, obj); 325 wrong_type_argument (Qchar_or_string_p, obj);
@@ -601,11 +601,11 @@ character positions to operate on. */)
601static Lisp_Object 601static Lisp_Object
602casify_word (enum case_action flag, Lisp_Object arg) 602casify_word (enum case_action flag, Lisp_Object arg)
603{ 603{
604 CHECK_NUMBER (arg); 604 CHECK_FIXNUM (arg);
605 ptrdiff_t farend = scan_words (PT, XINT (arg)); 605 ptrdiff_t farend = scan_words (PT, XINT (arg));
606 if (!farend) 606 if (!farend)
607 farend = XINT (arg) <= 0 ? BEGV : ZV; 607 farend = XINT (arg) <= 0 ? BEGV : ZV;
608 SET_PT (casify_region (flag, make_number (PT), make_number (farend))); 608 SET_PT (casify_region (flag, make_fixnum (PT), make_fixnum (farend)));
609 return Qnil; 609 return Qnil;
610} 610}
611 611