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/menu.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/menu.c')
| -rw-r--r-- | src/menu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/menu.c b/src/menu.c index e7d4d782fe8..1d0ba3c258f 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -86,7 +86,7 @@ init_menu_items (void) | |||
| 86 | if (NILP (menu_items)) | 86 | if (NILP (menu_items)) |
| 87 | { | 87 | { |
| 88 | menu_items_allocated = 60; | 88 | menu_items_allocated = 60; |
| 89 | menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil); | 89 | menu_items = Fmake_vector (make_fixnum (menu_items_allocated), Qnil); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | menu_items_inuse = Qt; | 92 | menu_items_inuse = Qt; |
| @@ -148,9 +148,9 @@ void | |||
| 148 | save_menu_items (void) | 148 | save_menu_items (void) |
| 149 | { | 149 | { |
| 150 | Lisp_Object saved = list4 (!NILP (menu_items_inuse) ? menu_items : Qnil, | 150 | Lisp_Object saved = list4 (!NILP (menu_items_inuse) ? menu_items : Qnil, |
| 151 | make_number (menu_items_used), | 151 | make_fixnum (menu_items_used), |
| 152 | make_number (menu_items_n_panes), | 152 | make_fixnum (menu_items_n_panes), |
| 153 | make_number (menu_items_submenu_depth)); | 153 | make_fixnum (menu_items_submenu_depth)); |
| 154 | record_unwind_protect (restore_menu_items, saved); | 154 | record_unwind_protect (restore_menu_items, saved); |
| 155 | menu_items_inuse = Qnil; | 155 | menu_items_inuse = Qnil; |
| 156 | menu_items = Qnil; | 156 | menu_items = Qnil; |
| @@ -1202,9 +1202,9 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu) | |||
| 1202 | int cur_x, cur_y; | 1202 | int cur_x, cur_y; |
| 1203 | 1203 | ||
| 1204 | x_relative_mouse_position (new_f, &cur_x, &cur_y); | 1204 | x_relative_mouse_position (new_f, &cur_x, &cur_y); |
| 1205 | /* cur_x/y may be negative, so use make_number. */ | 1205 | /* cur_x/y may be negative, so use make_fixnum. */ |
| 1206 | x = make_number (cur_x); | 1206 | x = make_fixnum (cur_x); |
| 1207 | y = make_number (cur_y); | 1207 | y = make_fixnum (cur_y); |
| 1208 | } | 1208 | } |
| 1209 | } | 1209 | } |
| 1210 | else | 1210 | else |