diff options
author | Tom Tromey <tom@tromey.com> | 2018-08-07 18:08:53 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-08-07 18:08:53 -0600 |
commit | d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch) | |
tree | 04c920acf142f686d3cac11080b17a2fb0dfc9af /src/category.c | |
parent | 68ebff23f7057090da260830500cb278f7b886a5 (diff) | |
download | emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.tar.gz |
More macro renamings for bignum
* src/alloc.c, src/bidi.c, src/buffer.c, src/buffer.h, src/bytecode.c,
src/callint.c, src/callproc.c, src/casefiddle.c, src/casetab.c,
src/category.c, src/ccl.c, src/character.c, src/character.h,
src/charset.c, src/charset.h, src/chartab.c, src/cmds.c, src/coding.c,
src/composite.c, src/composite.h, src/data.c, src/dbusbind.c,
src/decompress.c, src/dired.c, src/dispextern.h, src/dispnew.c,
src/disptab.h, src/doc.c, src/dosfns.c, src/editfns.c,
src/emacs-module.c, src/emacs.c, src/eval.c, src/fileio.c,
src/floatfns.c, src/fns.c, src/font.c, src/font.h, src/fontset.c,
src/frame.c, src/frame.h, src/fringe.c, src/ftcrfont.c, src/ftfont.c,
src/gfilenotify.c, src/gnutls.c, src/gtkutil.c, src/image.c,
src/indent.c, src/insdel.c, src/intervals.c, src/json.c,
src/keyboard.c, 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/syntax.h, src/sysdep.c, src/term.c,
src/termhooks.h, src/textprop.c, src/undo.c, src/w32.c,
src/w32console.c, src/w32fns.c, src/w32font.c, src/w32inevt.c,
src/w32proc.c, src/w32select.c, src/w32term.c, src/w32term.h,
src/w32uniscribe.c, src/window.c, src/xdisp.c, src/xfaces.c,
src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xml.c,
src/xrdb.c, src/xselect.c, src/xsettings.c, src/xterm.c, src/xwidget.c
Rename XINT->XFIXNUM, XFASTINT->XFIXNAT, XUINT->XUFIXNUM.
Diffstat (limited to 'src/category.c')
-rw-r--r-- | src/category.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/category.c b/src/category.c index 72b589c7902..d6ccde5369b 100644 --- a/src/category.c +++ b/src/category.c @@ -130,11 +130,11 @@ the current buffer's category table. */) CHECK_STRING (docstring); table = check_category_table (table); - if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) - error ("Category `%c' is already defined", (int) XFASTINT (category)); + if (!NILP (CATEGORY_DOCSTRING (table, XFIXNAT (category)))) + error ("Category `%c' is already defined", (int) XFIXNAT (category)); if (!NILP (Vpurify_flag)) docstring = Fpurecopy (docstring); - SET_CATEGORY_DOCSTRING (table, XFASTINT (category), docstring); + SET_CATEGORY_DOCSTRING (table, XFIXNAT (category), docstring); return Qnil; } @@ -148,7 +148,7 @@ category table. */) CHECK_CATEGORY (category); table = check_category_table (table); - return CATEGORY_DOCSTRING (table, XFASTINT (category)); + return CATEGORY_DOCSTRING (table, XFIXNAT (category)); } DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category, @@ -220,9 +220,9 @@ copy_category_entry (Lisp_Object table, Lisp_Object c, Lisp_Object val) { val = Fcopy_sequence (val); if (CONSP (c)) - char_table_set_range (table, XINT (XCAR (c)), XINT (XCDR (c)), val); + char_table_set_range (table, XFIXNUM (XCAR (c)), XFIXNUM (XCDR (c)), val); else - char_table_set (table, XINT (c), val); + char_table_set (table, XFIXNUM (c), val); } /* Return a copy of category table TABLE. We can't simply use the @@ -303,7 +303,7 @@ usage: (char-category-set CHAR) */) (Lisp_Object ch) { CHECK_CHARACTER (ch); - return CATEGORY_SET (XFASTINT (ch)); + return CATEGORY_SET (XFIXNAT (ch)); } DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics, @@ -349,22 +349,22 @@ then delete CATEGORY from the category set instead of adding it. */) if (FIXNUMP (character)) { CHECK_CHARACTER (character); - start = end = XFASTINT (character); + start = end = XFIXNAT (character); } else { CHECK_CONS (character); CHECK_CHARACTER_CAR (character); CHECK_CHARACTER_CDR (character); - start = XFASTINT (XCAR (character)); - end = XFASTINT (XCDR (character)); + start = XFIXNAT (XCAR (character)); + end = XFIXNAT (XCDR (character)); } CHECK_CATEGORY (category); table = check_category_table (table); - if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) - error ("Undefined category: %c", (int) XFASTINT (category)); + if (NILP (CATEGORY_DOCSTRING (table, XFIXNAT (category)))) + error ("Undefined category: %c", (int) XFIXNAT (category)); set_value = NILP (reset); @@ -372,10 +372,10 @@ then delete CATEGORY from the category set instead of adding it. */) { from = start, to = end; category_set = char_table_ref_and_range (table, start, &from, &to); - if (CATEGORY_MEMBER (XFASTINT (category), category_set) != NILP (reset)) + if (CATEGORY_MEMBER (XFIXNAT (category), category_set) != NILP (reset)) { category_set = Fcopy_sequence (category_set); - set_category_set (category_set, XFASTINT (category), set_value); + set_category_set (category_set, XFIXNAT (category), set_value); category_set = hash_get_category_set (table, category_set); char_table_set_range (table, start, to, category_set); } @@ -423,12 +423,12 @@ word_boundary_p (int c1, int c2) if (CONSP (elt) && (NILP (XCAR (elt)) || (CATEGORYP (XCAR (elt)) - && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1) - && ! CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set2))) + && CATEGORY_MEMBER (XFIXNAT (XCAR (elt)), category_set1) + && ! CATEGORY_MEMBER (XFIXNAT (XCAR (elt)), category_set2))) && (NILP (XCDR (elt)) || (CATEGORYP (XCDR (elt)) - && ! CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set1) - && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2)))) + && ! CATEGORY_MEMBER (XFIXNAT (XCDR (elt)), category_set1) + && CATEGORY_MEMBER (XFIXNAT (XCDR (elt)), category_set2)))) return !default_result; } return default_result; |