diff options
| author | Tom Tromey | 2018-08-07 18:08:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-07 18:08:53 -0600 |
| commit | d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch) | |
| tree | 04c920acf142f686d3cac11080b17a2fb0dfc9af /src/macros.c | |
| parent | 68ebff23f7057090da260830500cb278f7b886a5 (diff) | |
| download | emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.tar.gz emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.zip | |
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/macros.c')
| -rw-r--r-- | src/macros.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/macros.c b/src/macros.c index be841069927..0677021bfd2 100644 --- a/src/macros.c +++ b/src/macros.c | |||
| @@ -98,8 +98,8 @@ macro before appending to it. */) | |||
| 98 | { | 98 | { |
| 99 | Lisp_Object c; | 99 | Lisp_Object c; |
| 100 | c = Faref (KVAR (current_kboard, Vlast_kbd_macro), make_fixnum (i)); | 100 | c = Faref (KVAR (current_kboard, Vlast_kbd_macro), make_fixnum (i)); |
| 101 | if (cvt && FIXNATP (c) && (XFASTINT (c) & 0x80)) | 101 | if (cvt && FIXNATP (c) && (XFIXNAT (c) & 0x80)) |
| 102 | XSETFASTINT (c, CHAR_META | (XFASTINT (c) & ~0x80)); | 102 | XSETFASTINT (c, CHAR_META | (XFIXNAT (c) & ~0x80)); |
| 103 | current_kboard->kbd_macro_buffer[i] = c; | 103 | current_kboard->kbd_macro_buffer[i] = c; |
| 104 | } | 104 | } |
| 105 | 105 | ||
| @@ -162,11 +162,11 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 162 | message1 ("Keyboard macro defined"); | 162 | message1 ("Keyboard macro defined"); |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | if (XFASTINT (repeat) == 0) | 165 | if (XFIXNAT (repeat) == 0) |
| 166 | Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), repeat, loopfunc); | 166 | Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), repeat, loopfunc); |
| 167 | else if (XINT (repeat) > 1) | 167 | else if (XFIXNUM (repeat) > 1) |
| 168 | { | 168 | { |
| 169 | XSETINT (repeat, XINT (repeat) - 1); | 169 | XSETINT (repeat, XFIXNUM (repeat) - 1); |
| 170 | Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), | 170 | Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), |
| 171 | repeat, loopfunc); | 171 | repeat, loopfunc); |
| 172 | } | 172 | } |
| @@ -267,7 +267,7 @@ pop_kbd_macro (Lisp_Object info) | |||
| 267 | Lisp_Object tem; | 267 | Lisp_Object tem; |
| 268 | Vexecuting_kbd_macro = XCAR (info); | 268 | Vexecuting_kbd_macro = XCAR (info); |
| 269 | tem = XCDR (info); | 269 | tem = XCDR (info); |
| 270 | executing_kbd_macro_index = XINT (XCAR (tem)); | 270 | executing_kbd_macro_index = XFIXNUM (XCAR (tem)); |
| 271 | Vreal_this_command = XCDR (tem); | 271 | Vreal_this_command = XCDR (tem); |
| 272 | run_hook (Qkbd_macro_termination_hook); | 272 | run_hook (Qkbd_macro_termination_hook); |
| 273 | } | 273 | } |
| @@ -293,7 +293,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) | |||
| 293 | if (!NILP (count)) | 293 | if (!NILP (count)) |
| 294 | { | 294 | { |
| 295 | count = Fprefix_numeric_value (count); | 295 | count = Fprefix_numeric_value (count); |
| 296 | repeat = XINT (count); | 296 | repeat = XFIXNUM (count); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | final = indirect_function (macro); | 299 | final = indirect_function (macro); |