diff options
| author | Tom Tromey | 2018-07-06 21:56:17 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-07-12 22:12:27 -0600 |
| commit | 42fe787b0f26c2df682b2797407a669ef8522ccb (patch) | |
| tree | e944fe465e2b65703a8361bc82647faf4f7907f1 /src/undo.c | |
| parent | 01dbf2a347944497fdcf2ec156f4605020d7ba2a (diff) | |
| download | emacs-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/undo.c')
| -rw-r--r-- | src/undo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/undo.c b/src/undo.c index c34faa42720..7d2402fda38 100644 --- a/src/undo.c +++ b/src/undo.c | |||
| @@ -74,7 +74,7 @@ record_point (ptrdiff_t beg) | |||
| 74 | && point_before_last_command_or_undo != beg | 74 | && point_before_last_command_or_undo != beg |
| 75 | && buffer_before_last_command_or_undo == current_buffer ) | 75 | && buffer_before_last_command_or_undo == current_buffer ) |
| 76 | bset_undo_list (current_buffer, | 76 | bset_undo_list (current_buffer, |
| 77 | Fcons (make_number (point_before_last_command_or_undo), | 77 | Fcons (make_fixnum (point_before_last_command_or_undo), |
| 78 | BVAR (current_buffer, undo_list))); | 78 | BVAR (current_buffer, undo_list))); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| @@ -102,11 +102,11 @@ record_insert (ptrdiff_t beg, ptrdiff_t length) | |||
| 102 | Lisp_Object elt; | 102 | Lisp_Object elt; |
| 103 | elt = XCAR (BVAR (current_buffer, undo_list)); | 103 | elt = XCAR (BVAR (current_buffer, undo_list)); |
| 104 | if (CONSP (elt) | 104 | if (CONSP (elt) |
| 105 | && INTEGERP (XCAR (elt)) | 105 | && FIXNUMP (XCAR (elt)) |
| 106 | && INTEGERP (XCDR (elt)) | 106 | && FIXNUMP (XCDR (elt)) |
| 107 | && XINT (XCDR (elt)) == beg) | 107 | && XINT (XCDR (elt)) == beg) |
| 108 | { | 108 | { |
| 109 | XSETCDR (elt, make_number (beg + length)); | 109 | XSETCDR (elt, make_fixnum (beg + length)); |
| 110 | return; | 110 | return; |
| 111 | } | 111 | } |
| 112 | } | 112 | } |
| @@ -153,7 +153,7 @@ record_marker_adjustments (ptrdiff_t from, ptrdiff_t to) | |||
| 153 | XSETMISC (marker, m); | 153 | XSETMISC (marker, m); |
| 154 | bset_undo_list | 154 | bset_undo_list |
| 155 | (current_buffer, | 155 | (current_buffer, |
| 156 | Fcons (Fcons (marker, make_number (adjustment)), | 156 | Fcons (Fcons (marker, make_fixnum (adjustment)), |
| 157 | BVAR (current_buffer, undo_list))); | 157 | BVAR (current_buffer, undo_list))); |
| 158 | } | 158 | } |
| 159 | } | 159 | } |
| @@ -352,14 +352,14 @@ truncate_undo_list (struct buffer *b) | |||
| 352 | 352 | ||
| 353 | /* If by the first boundary we have already passed undo_outer_limit, | 353 | /* If by the first boundary we have already passed undo_outer_limit, |
| 354 | we're heading for memory full, so offer to clear out the list. */ | 354 | we're heading for memory full, so offer to clear out the list. */ |
| 355 | if (INTEGERP (Vundo_outer_limit) | 355 | if (FIXNUMP (Vundo_outer_limit) |
| 356 | && size_so_far > XINT (Vundo_outer_limit) | 356 | && size_so_far > XINT (Vundo_outer_limit) |
| 357 | && !NILP (Vundo_outer_limit_function)) | 357 | && !NILP (Vundo_outer_limit_function)) |
| 358 | { | 358 | { |
| 359 | Lisp_Object tem; | 359 | Lisp_Object tem; |
| 360 | 360 | ||
| 361 | /* Normally the function this calls is undo-outer-limit-truncate. */ | 361 | /* Normally the function this calls is undo-outer-limit-truncate. */ |
| 362 | tem = call1 (Vundo_outer_limit_function, make_number (size_so_far)); | 362 | tem = call1 (Vundo_outer_limit_function, make_fixnum (size_so_far)); |
| 363 | if (! NILP (tem)) | 363 | if (! NILP (tem)) |
| 364 | { | 364 | { |
| 365 | /* The function is responsible for making | 365 | /* The function is responsible for making |
| @@ -472,7 +472,7 @@ In fact, this calls the function which is the value of | |||
| 472 | `undo-outer-limit-function' with one argument, the size. | 472 | `undo-outer-limit-function' with one argument, the size. |
| 473 | The text above describes the behavior of the function | 473 | The text above describes the behavior of the function |
| 474 | that variable usually specifies. */); | 474 | that variable usually specifies. */); |
| 475 | Vundo_outer_limit = make_number (12000000); | 475 | Vundo_outer_limit = make_fixnum (12000000); |
| 476 | 476 | ||
| 477 | DEFVAR_LISP ("undo-outer-limit-function", Vundo_outer_limit_function, | 477 | DEFVAR_LISP ("undo-outer-limit-function", Vundo_outer_limit_function, |
| 478 | doc: /* Function to call when an undo list exceeds `undo-outer-limit'. | 478 | doc: /* Function to call when an undo list exceeds `undo-outer-limit'. |