aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmds.c
diff options
context:
space:
mode:
authorTom Tromey2018-08-07 18:08:53 -0600
committerTom Tromey2018-08-07 18:08:53 -0600
commitd1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch)
tree04c920acf142f686d3cac11080b17a2fb0dfc9af /src/cmds.c
parent68ebff23f7057090da260830500cb278f7b886a5 (diff)
downloademacs-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/cmds.c')
-rw-r--r--src/cmds.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/cmds.c b/src/cmds.c
index 857197cf9b1..1616efbb446 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -37,7 +37,7 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
37{ 37{
38 CHECK_FIXNUM (n); 38 CHECK_FIXNUM (n);
39 39
40 return make_fixnum (PT + XINT (n)); 40 return make_fixnum (PT + XFIXNUM (n));
41} 41}
42 42
43/* Add N to point; or subtract N if FORWARD is false. N defaults to 1. 43/* Add N to point; or subtract N if FORWARD is false. N defaults to 1.
@@ -45,7 +45,7 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
45static Lisp_Object 45static Lisp_Object
46move_point (Lisp_Object n, bool forward) 46move_point (Lisp_Object n, bool forward)
47{ 47{
48 /* This used to just set point to point + XINT (n), and then check 48 /* This used to just set point to point + XFIXNUM (n), and then check
49 to see if it was within boundaries. But now that SET_PT can 49 to see if it was within boundaries. But now that SET_PT can
50 potentially do a lot of stuff (calling entering and exiting 50 potentially do a lot of stuff (calling entering and exiting
51 hooks, etcetera), that's not a good approach. So we validate the 51 hooks, etcetera), that's not a good approach. So we validate the
@@ -58,7 +58,7 @@ move_point (Lisp_Object n, bool forward)
58 else 58 else
59 CHECK_FIXNUM (n); 59 CHECK_FIXNUM (n);
60 60
61 new_point = PT + (forward ? XINT (n) : - XINT (n)); 61 new_point = PT + (forward ? XFIXNUM (n) : - XFIXNUM (n));
62 62
63 if (new_point < BEGV) 63 if (new_point < BEGV)
64 { 64 {
@@ -128,7 +128,7 @@ go to its beginning. */)
128 else 128 else
129 { 129 {
130 CHECK_FIXNUM (n); 130 CHECK_FIXNUM (n);
131 count = XINT (n); 131 count = XFIXNUM (n);
132 } 132 }
133 133
134 shortage = scan_newline_from_point (count, &pos, &pos_byte); 134 shortage = scan_newline_from_point (count, &pos, &pos_byte);
@@ -164,7 +164,7 @@ instead. For instance, `(forward-line 0)' does the same thing as
164 else 164 else
165 CHECK_FIXNUM (n); 165 CHECK_FIXNUM (n);
166 166
167 SET_PT (XINT (Fline_beginning_position (n))); 167 SET_PT (XFIXNUM (Fline_beginning_position (n)));
168 168
169 return Qnil; 169 return Qnil;
170} 170}
@@ -191,7 +191,7 @@ to t. */)
191 191
192 while (1) 192 while (1)
193 { 193 {
194 newpos = XINT (Fline_end_position (n)); 194 newpos = XFIXNUM (Fline_end_position (n));
195 SET_PT (newpos); 195 SET_PT (newpos);
196 196
197 if (PT > newpos 197 if (PT > newpos
@@ -232,13 +232,13 @@ because it respects values of `delete-active-region' and `overwrite-mode'. */)
232 232
233 CHECK_FIXNUM (n); 233 CHECK_FIXNUM (n);
234 234
235 if (eabs (XINT (n)) < 2) 235 if (eabs (XFIXNUM (n)) < 2)
236 call0 (Qundo_auto_amalgamate); 236 call0 (Qundo_auto_amalgamate);
237 237
238 pos = PT + XINT (n); 238 pos = PT + XFIXNUM (n);
239 if (NILP (killflag)) 239 if (NILP (killflag))
240 { 240 {
241 if (XINT (n) < 0) 241 if (XFIXNUM (n) < 0)
242 { 242 {
243 if (pos < BEGV) 243 if (pos < BEGV)
244 xsignal0 (Qbeginning_of_buffer); 244 xsignal0 (Qbeginning_of_buffer);
@@ -276,10 +276,10 @@ a non-nil value for the inserted character. At the end, it runs
276{ 276{
277 CHECK_FIXNUM (n); 277 CHECK_FIXNUM (n);
278 278
279 if (XINT (n) < 0) 279 if (XFIXNUM (n) < 0)
280 error ("Negative repetition argument %"pI"d", XINT (n)); 280 error ("Negative repetition argument %"pI"d", XFIXNUM (n));
281 281
282 if (XFASTINT (n) < 2) 282 if (XFIXNAT (n) < 2)
283 call0 (Qundo_auto_amalgamate); 283 call0 (Qundo_auto_amalgamate);
284 284
285 /* Barf if the key that invoked this was not a character. */ 285 /* Barf if the key that invoked this was not a character. */
@@ -287,8 +287,8 @@ a non-nil value for the inserted character. At the end, it runs
287 bitch_at_user (); 287 bitch_at_user ();
288 else { 288 else {
289 int character = translate_char (Vtranslation_table_for_input, 289 int character = translate_char (Vtranslation_table_for_input,
290 XINT (last_command_event)); 290 XFIXNUM (last_command_event));
291 int val = internal_self_insert (character, XFASTINT (n)); 291 int val = internal_self_insert (character, XFIXNAT (n));
292 if (val == 2) 292 if (val == 2)
293 Fset (Qundo_auto__this_command_amalgamating, Qnil); 293 Fset (Qundo_auto__this_command_amalgamating, Qnil);
294 frame_make_pointer_invisible (SELECTED_FRAME ()); 294 frame_make_pointer_invisible (SELECTED_FRAME ());
@@ -360,7 +360,7 @@ internal_self_insert (int c, EMACS_INT n)
360 if (EQ (overwrite, Qoverwrite_mode_binary)) 360 if (EQ (overwrite, Qoverwrite_mode_binary))
361 chars_to_delete = min (n, PTRDIFF_MAX); 361 chars_to_delete = min (n, PTRDIFF_MAX);
362 else if (c != '\n' && c2 != '\n' 362 else if (c != '\n' && c2 != '\n'
363 && (cwidth = XFASTINT (Fchar_width (make_fixnum (c)))) != 0) 363 && (cwidth = XFIXNAT (Fchar_width (make_fixnum (c)))) != 0)
364 { 364 {
365 ptrdiff_t pos = PT; 365 ptrdiff_t pos = PT;
366 ptrdiff_t pos_byte = PT_BYTE; 366 ptrdiff_t pos_byte = PT_BYTE;
@@ -378,7 +378,7 @@ internal_self_insert (int c, EMACS_INT n)
378 character. In that case, the new point is set after 378 character. In that case, the new point is set after
379 that character. */ 379 that character. */
380 ptrdiff_t actual_clm 380 ptrdiff_t actual_clm
381 = XFASTINT (Fmove_to_column (make_fixnum (target_clm), Qnil)); 381 = XFIXNAT (Fmove_to_column (make_fixnum (target_clm), Qnil));
382 382
383 chars_to_delete = PT - pos; 383 chars_to_delete = PT - pos;
384 384
@@ -408,8 +408,8 @@ internal_self_insert (int c, EMACS_INT n)
408 && NILP (BVAR (current_buffer, read_only)) 408 && NILP (BVAR (current_buffer, read_only))
409 && PT > BEGV 409 && PT > BEGV
410 && (SYNTAX (!NILP (BVAR (current_buffer, enable_multibyte_characters)) 410 && (SYNTAX (!NILP (BVAR (current_buffer, enable_multibyte_characters))
411 ? XFASTINT (Fprevious_char ()) 411 ? XFIXNAT (Fprevious_char ())
412 : UNIBYTE_TO_CHAR (XFASTINT (Fprevious_char ()))) 412 : UNIBYTE_TO_CHAR (XFIXNAT (Fprevious_char ())))
413 == Sword)) 413 == Sword))
414 { 414 {
415 EMACS_INT modiff = MODIFF; 415 EMACS_INT modiff = MODIFF;