diff options
| -rw-r--r-- | src/ChangeLog | 83 | ||||
| -rw-r--r-- | src/abbrev.c | 2 | ||||
| -rw-r--r-- | src/alloc.c | 24 | ||||
| -rw-r--r-- | src/callproc.c | 2 | ||||
| -rw-r--r-- | src/charset.c | 10 | ||||
| -rw-r--r-- | src/commands.h | 2 | ||||
| -rw-r--r-- | src/dispextern.h | 2 | ||||
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/dosfns.c | 16 | ||||
| -rw-r--r-- | src/dosfns.h | 18 | ||||
| -rw-r--r-- | src/emacs.c | 2 | ||||
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 16 | ||||
| -rw-r--r-- | src/keyboard.h | 2 | ||||
| -rw-r--r-- | src/lisp.h | 11 | ||||
| -rw-r--r-- | src/lread.c | 2 | ||||
| -rw-r--r-- | src/sysdep.c | 2 | ||||
| -rw-r--r-- | src/termcap.c | 2 | ||||
| -rw-r--r-- | src/termchar.h | 2 | ||||
| -rw-r--r-- | src/w32term.c | 2 | ||||
| -rw-r--r-- | src/window.c | 10 | ||||
| -rw-r--r-- | src/xdisp.c | 16 | ||||
| -rw-r--r-- | src/xselect.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
24 files changed, 120 insertions, 116 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fe39168e5b0..40706a5c94a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2002-03-04 Stefan Monnier <monnier@cs.yale.edu> + + * dosfns.c, dosfns.h, dispnew.c, dispextern.h, commands.h, charset.c, + * alloc.c, abbrev.c, emacs.c, eval.c, keyboard.c, keyboard.h, + * lisp.h, lread.c, sysdep.c, termcap.c, termchar.h, w32term.c, + * window.c, xdisp.c, xselect.c, xterm.c: Change defvar_int definition + and variables to use EMACS_INT instead of just int. + 2002-03-04 Eli Zaretskii <eliz@is.elta.co.il> * sysdep.c (sys_subshell) [MSDOS]: If PWD is set in the @@ -54,10 +62,9 @@ * xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Renamed from automatic-hscrolling. Users changed. - <hscroll-margin>: Renamed from automatic-hscroll-margin. Users - changed. - <hscroll-step>: Renamed from automatic-hscroll-step. Users - changed. + <hscroll-margin>: Renamed from automatic-hscroll-margin. + Users changed. + <hscroll-step>: Renamed from automatic-hscroll-step. Users changed. 2002-03-02 Eli Zaretskii <eliz@is.elta.co.il> @@ -73,7 +80,7 @@ * window.h (struct window): New member phys_cursor_width. * window.c (make_window, replace_window): Init phys_cursor_width. - + * xterm.c (x_display_and_set_cursor): Blink box cursor using hollow box cursor. Blink bar cursor using 1 pixel wide bar. @@ -99,7 +106,7 @@ (wait_reading_process_input): Poll for status of non-blocking connects. Exec sentinel directly when connect succeeds. (status_notify): Don't read process output if not yet connected. - + 2002-02-28 Kim F. Storm <storm@cua.dk> * window.c: (minibuf_selected_window): Renamed from @@ -111,7 +118,7 @@ The following changes add a new Vminibuf_selected_window variable which is similar to Vminibuf_scroll_window, but which is only set on entry to the minibuffer (from a non-minibuffer window): - + * window.c: (Vminibuf_selected_window): New variable. (struct save_window_data): New member minibuf_selected_window. (Fset_window_configuration): Restore Vminibuf_selected_window. @@ -164,16 +171,16 @@ 2002-02-23 Kim F. Storm <storm@cua.dk> - The following changes rework my patch of 2002-02-06 which + The following changes rework my patch of 2002-02-06 which added command remapping by entering the commands directly into the keymaps. Now, command remapping uses an explicit `remap' prefix in the keymaps, i.e. [remap COMMAND]. - + * keymap.c (Qremap, remap_command_vector): New variables. (is_command_symbol): Removed function. - (Fdefine_key): No longer accept a symbol for KEY. Added - validation of [remap COMMAND] argument for KEY. The DEF is no - longer required to be a symbol when remapping a command. + (Fdefine_key): No longer accept a symbol for KEY. + Added validation of [remap COMMAND] argument for KEY. + The DEF is no longer required to be a symbol when remapping a command. (Fremap_command): New function to remap command through keymaps. (Flookup_key): Perform command remapping initiated by Fremap_command directly for speed. @@ -184,7 +191,7 @@ * keymap.h (Fremap_command): Declare extern. (is_command_symbol): Remove extern. - + * keyboard.c (command_loop_1): Use Fremap_command for command remapping; now try command remapping for all symbols. @@ -227,8 +234,8 @@ (w32_wnd_proc) <WM_TIMER>: Handle menu_free_timer. <WM_EXITMENULOOP>: Delay before freeing menu. Do nothing if a menu command is in progress. - <WM_COMMAND>: Set the menu_command_in_progress flag. Kill - any menu_free_timer that is running. + <WM_COMMAND>: Set the menu_command_in_progress flag. + Kill any menu_free_timer that is running. * w32term.c (w32_text_out): Renamed from W32_TEXTOUT. Call ExtTextOutA rather than ExtTextOut. @@ -266,8 +273,8 @@ * frame.c (syms_of_frame): Change mouse-highlight default to t. - * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: Corrected - composing of language-change event. + * keyboard.c (kbd_buffer_get_event) [WINDOWSNT]: + Correct composing of language-change event. 2002-02-20 Kim F. Storm <storm@cua.dk> @@ -306,15 +313,15 @@ (x_frame_parms) <"fullscreen">: New parameter. (x_fullscreen_move, x_set_fullscreen): New functions. (x_set_frame_parameters): Support Qfullscreen. - (x_real_positions): Save x/y_pixels_diff frame params. + (x_real_positions): Save x/y_pixels_diff frame params. (x_figure_window_size): Support full-screen frames. (Fx_create_frame): Default the fullscreen parameter. - * w32term.c (x_check_fullscreen, x_check_fullscreen_move) + * w32term.c (x_check_fullscreen, x_check_fullscreen_move) (x_fullscreen_adjust): New functions. (w32_read_socket) <WM_WINDOWPOSCHANGED>: Don't resize to fullscreen. Call x_check_fullscreen_move, and set the - want_fullscreen member of output_data.w32 + want_fullscreen member of output_data.w32 <WM_ACTIVATE, WM_ACTIVATEAPP>: Call x_check_fullscreen. * w32term.h: New enum for FULLSCREEN_* constants. @@ -362,8 +369,7 @@ (dos_rawgetc): Fix last change--if the mouse is in the same window as recorded in last_mouse_window, don't select this window. - * Makefile.in (lisp, shortlisp): Use cus-start.elc, not - cus-start.el. + * Makefile.in (lisp, shortlisp): Use cus-start.elc, not cus-start.el. * msdos.c (x_autoselect_window_p): New variable. (syms_of_msdos): Defvar it. @@ -371,8 +377,8 @@ in which the last mouse movement occured, unless it is already selected. - * xdisp.c (automatic_hscroll_margin, Vautomatic_hscroll_step): New - variables. + * xdisp.c (automatic_hscroll_margin, Vautomatic_hscroll_step): + New variables. (syms_of_xdisp): DEVFAR them. (hscroll_window_tree): Use automatic_hscroll_margin and Vautomatic_hscroll_step to compute the amount of window scrolling. @@ -398,8 +404,7 @@ (Vx_super_keysym): New variables. (syms_of_xterm): DEFVAR_LISP them. (x_x_to_emacs_modifiers, x_emacs_to_x_modifiers): Use the - variables to determine which keys to use for the various - modifiers. + variables to determine which keys to use for the various modifiers. 2002-02-13 Kim F. Storm <storm@cua.dk> @@ -407,18 +412,18 @@ (mode_line_in_non_selected_windows): New variable. (syms_of_window): DEFVAR_BOOL it. - * dispextern.h (CURRENT_MODE_LINE_FACE_ID_3): Use - mode_line_in_non_selected_windows. + * dispextern.h (CURRENT_MODE_LINE_FACE_ID_3): + Use mode_line_in_non_selected_windows. (mode_line_in_non_selected_windows): Declare extern. (Vmode_line_in_non_selected_windows): Removed extern. 2002-02-13 Richard M. Stallman <rms@gnu.org> - * keyboard.c (Fthis_command_keys, Fthis_command_keys_vector) - (Fthis_single_command_keys, Fthis_single_command_raw_keys) + * keyboard.c (Fthis_command_keys, Fthis_command_keys_vector) + (Fthis_single_command_keys, Fthis_single_command_raw_keys) (Fclear_this_command_keys): Doc fixes. - * xfaces.c (Finternal_make_lisp_face, Finternal_copy_lisp_face) + * xfaces.c (Finternal_make_lisp_face, Finternal_copy_lisp_face) (update_face_from_frame_parameter): Increment face_change_count and windows_or_buffers_changed to force redisplay using changed faces. @@ -429,9 +434,9 @@ Handle literal output of strings by sharing the main-line code for strings, using local var `literal'. Handle :propertize feature. - (syms_of_xdisp): Initialze and staticpro QCpropertize and + (syms_of_xdisp): Initialze and staticpro QCpropertize and mode_line_proptrans_alist. - + 2002-02-11 Kim F. Storm <storm@cua.dk> * window.c: (Vmode_line_in_non_selected_windows): New variable. @@ -486,14 +491,13 @@ 2002-02-08 Kim F. Storm <storm@cua.dk> - * alloc.c (SETJMP_WILL_LIKELY_WORK, SETJMP_WILL_NOT_WORK): + * alloc.c (SETJMP_WILL_LIKELY_WORK, SETJMP_WILL_NOT_WORK): Changed mail addresses to emacs-devel@gnu.org. 2002-02-08 Eli Zaretskii <eliz@is.elta.co.il> * fileio.c (Fsubstitute_in_file_name): If the file name includes - ~user, and there's no such user, don't discard everything before - ~user. + ~user, and there's no such user, don't discard everything before ~user. * floatfns.c (Fround): Doc fix. @@ -540,8 +544,7 @@ 2002-02-06 Pavel Jan,Bm(Bk <Pavel@Janik.cz> - * keyboard.c (recursive_edit_1): Call cancel_hourglass - unconditionally. + * keyboard.c (recursive_edit_1): Call cancel_hourglass unconditionally. 2002-02-06 Jason Rumney <jasonr@gnu.org> @@ -785,8 +788,8 @@ 2002-01-15 Pavel Jan,Bm(Bk <Pavel@Janik.cz> - * buffer.c (Fkill_all_local_variables): Increment - `update_mode_lines' only once. + * buffer.c (Fkill_all_local_variables): + Increment `update_mode_lines' only once. 2002-01-14 Pavel Jan,Bm(Bk <Pavel@Janik.cz> diff --git a/src/abbrev.c b/src/abbrev.c index d134f95f25b..5964909261d 100644 --- a/src/abbrev.c +++ b/src/abbrev.c @@ -77,7 +77,7 @@ Lisp_Object Vlast_abbrev_text; /* Character address of start of last abbrev expanded */ -int last_abbrev_point; +EMACS_INT last_abbrev_point; /* Hook to run before expanding any abbrev. */ diff --git a/src/alloc.c b/src/alloc.c index 2592d71d22c..5eafa21c2c7 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -122,18 +122,18 @@ int consing_since_gc; /* Count the amount of consing of various sorts of space. */ -int cons_cells_consed; -int floats_consed; -int vector_cells_consed; -int symbols_consed; -int string_chars_consed; -int misc_objects_consed; -int intervals_consed; -int strings_consed; +EMACS_INT cons_cells_consed; +EMACS_INT floats_consed; +EMACS_INT vector_cells_consed; +EMACS_INT symbols_consed; +EMACS_INT string_chars_consed; +EMACS_INT misc_objects_consed; +EMACS_INT intervals_consed; +EMACS_INT strings_consed; /* Number of bytes of consing since GC before another GC should be done. */ -int gc_cons_threshold; +EMACS_INT gc_cons_threshold; /* Nonzero during GC. */ @@ -155,8 +155,8 @@ int malloc_sbrk_unused; /* Two limits controlling how much undo information to keep. */ -int undo_limit; -int undo_strong_limit; +EMACS_INT undo_limit; +EMACS_INT undo_strong_limit; /* Number of live and free conses etc. */ @@ -215,7 +215,7 @@ static size_t pure_bytes_used_before_overflow; /* Index in pure at which next pure object will be allocated.. */ -int pure_bytes_used; +EMACS_INT pure_bytes_used; /* If nonzero, this is a warning delivered by malloc and not yet displayed. */ diff --git a/src/callproc.c b/src/callproc.c index f35485f9fe8..56f8efb4ce7 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1151,7 +1151,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) #ifdef SET_EMACS_PRIORITY { - extern int emacs_priority; + extern EMACS_INT emacs_priority; if (emacs_priority < 0) nice (- emacs_priority); diff --git a/src/charset.c b/src/charset.c index ff177a6cb29..66c239d1bc2 100644 --- a/src/charset.c +++ b/src/charset.c @@ -49,10 +49,10 @@ Lisp_Object Qcharset, Qascii, Qeight_bit_control, Qeight_bit_graphic; Lisp_Object Qunknown; /* Declaration of special leading-codes. */ -int leading_code_private_11; /* for private DIMENSION1 of 1-column */ -int leading_code_private_12; /* for private DIMENSION1 of 2-column */ -int leading_code_private_21; /* for private DIMENSION2 of 1-column */ -int leading_code_private_22; /* for private DIMENSION2 of 2-column */ +EMACS_INT leading_code_private_11; /* for private DIMENSION1 of 1-column */ +EMACS_INT leading_code_private_12; /* for private DIMENSION1 of 2-column */ +EMACS_INT leading_code_private_21; /* for private DIMENSION2 of 1-column */ +EMACS_INT leading_code_private_22; /* for private DIMENSION2 of 2-column */ /* Declaration of special charsets. The values are set by Fsetup_special_charsets. */ @@ -98,7 +98,7 @@ unsigned char *_fetch_multibyte_char_p; int _fetch_multibyte_char_len; /* Offset to add to a non-ASCII value when inserting it. */ -int nonascii_insert_offset; +EMACS_INT nonascii_insert_offset; /* Translation table for converting non-ASCII unibyte characters to multibyte codes, or nil. */ diff --git a/src/commands.h b/src/commands.h index 0494478541c..d830573b58b 100644 --- a/src/commands.h +++ b/src/commands.h @@ -51,7 +51,7 @@ extern Lisp_Object Vunread_command_events; /* Command char event to be re-read, or -1 if none. Setting this is obsolete, but some things should still check it. */ -extern int unread_command_char; +extern EMACS_INT unread_command_char; /* The command being executed by the command loop. Commands may set this, and the value set will be copied into diff --git a/src/dispextern.h b/src/dispextern.h index 7777e56f98e..2b5e2e80562 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2188,7 +2188,7 @@ extern Lisp_Object Vtool_bar_button_margin; /* Thickness of relief to draw around tool-bar buttons. */ -extern int tool_bar_button_relief; +extern EMACS_INT tool_bar_button_relief; /* Default values of the above variables. */ diff --git a/src/dispnew.c b/src/dispnew.c index 84cab92eaf5..4f7e36f5c19 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -211,7 +211,7 @@ int inverse_video; /* Line speed of the terminal. */ -int baud_rate; +EMACS_INT baud_rate; /* Either nil or a symbol naming the window system under which Emacs is running. */ diff --git a/src/dosfns.c b/src/dosfns.c index 3c185bb035e..d54f2e3edc0 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -240,11 +240,11 @@ Return nil if startup screen is not available. */) } /* country info */ -int dos_country_code; -int dos_codepage; -int dos_timezone_offset; -int dos_decimal_point; -int dos_keyboard_layout; +EMACS_INT dos_country_code; +EMACS_INT dos_codepage; +EMACS_INT dos_timezone_offset; +EMACS_INT dos_decimal_point; +EMACS_INT dos_keyboard_layout; unsigned char dos_country_info[DOS_COUNTRY_INFO]; static unsigned char usa_country_info[DOS_COUNTRY_INFO] = { 0, 0, /* date format */ @@ -261,9 +261,9 @@ static unsigned char usa_country_info[DOS_COUNTRY_INFO] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /* reserved */ }; -int dos_hyper_key; -int dos_super_key; -int dos_keypad_mode; +EMACS_INT dos_hyper_key; +EMACS_INT dos_super_key; +EMACS_INT dos_keypad_mode; Lisp_Object Vdos_version; Lisp_Object Vdos_display_scancodes; diff --git a/src/dosfns.h b/src/dosfns.h index 8575d411088..00e2e1ed1a3 100644 --- a/src/dosfns.h +++ b/src/dosfns.h @@ -22,15 +22,15 @@ along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -extern int dos_hyper_key; -extern int dos_super_key; -extern int dos_decimal_point; -extern int dos_keypad_mode; - -extern int dos_keyboard_layout; -extern int dos_country_code; -extern int dos_codepage; -extern int dos_timezone_offset; +extern EMACS_INT dos_hyper_key; +extern EMACS_INT dos_super_key; +extern EMACS_INT dos_decimal_point; +extern EMACS_INT dos_keypad_mode; + +extern EMACS_INT dos_keyboard_layout; +extern EMACS_INT dos_country_code; +extern EMACS_INT dos_codepage; +extern EMACS_INT dos_timezone_offset; #define DOS_COUNTRY_INFO 34 /* no of bytes returned by dos int 38h */ extern unsigned char dos_country_info[DOS_COUNTRY_INFO]; diff --git a/src/emacs.c b/src/emacs.c index eeb9002fe3c..debb7a90df0 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -165,7 +165,7 @@ int inhibit_window_system; /* If nonzero, set Emacs to run at this priority. This is also used in child_setup and sys_suspend to make sure subshells run at normal priority; those functions have their own extern declaration. */ -int emacs_priority; +EMACS_INT emacs_priority; /* If non-zero, a filter or a sentinel is running. Tested to save the match data on the first attempt to change it inside asynchronous code. */ diff --git a/src/eval.c b/src/eval.c index 0970086fedc..c2ebfd46fe8 100644 --- a/src/eval.c +++ b/src/eval.c @@ -119,7 +119,7 @@ struct specbinding *specpdl_ptr; /* Maximum size allowed for specpdl allocation */ -int max_specpdl_size; +EMACS_INT max_specpdl_size; /* Depth in Lisp evaluations and function calls. */ @@ -127,7 +127,7 @@ int lisp_eval_depth; /* Maximum allowed depth in Lisp evaluations and function calls. */ -int max_lisp_eval_depth; +EMACS_INT max_lisp_eval_depth; /* Nonzero means enter debugger before next function call */ diff --git a/src/keyboard.c b/src/keyboard.c index 61f27adb3d5..0e777a6bd07 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -298,7 +298,7 @@ Lisp_Object Vspecial_event_map; int command_loop_level; /* Total number of times command_loop has read a key sequence. */ -int num_input_keys; +EMACS_INT num_input_keys; /* Last input character read as a command. */ Lisp_Object last_command_char; @@ -322,7 +322,7 @@ Lisp_Object Vunread_input_method_events; Lisp_Object Vunread_post_input_method_events; /* If not -1, an event to be read as subsequent command input. */ -int unread_command_char; +EMACS_INT unread_command_char; /* If not Qnil, this is a switch-frame event which we decided to put off until the end of a key sequence. This should be read as the @@ -334,7 +334,7 @@ int unread_command_char; Lisp_Object unread_switch_frame; /* A mask of extra modifier bits to put into every keyboard char. */ -int extra_keyboard_modifiers; +EMACS_INT extra_keyboard_modifiers; /* Char to use as prefix when a meta character is typed in. This is bound on entry to minibuffer in case ESC is changed there. */ @@ -351,12 +351,12 @@ static Lisp_Object Vauto_save_timeout; int num_input_events; /* Total number of times read_char has returned, outside of macros. */ -int num_nonmacro_input_events; +EMACS_INT num_nonmacro_input_events; /* Auto-save automatically when this many characters have been typed since the last time. */ -static int auto_save_interval; +static EMACS_INT auto_save_interval; /* Value of num_nonmacro_input_events as of last auto save. */ @@ -448,7 +448,7 @@ Lisp_Object Qcommand_hook_internal, Vcommand_hook_internal; Lisp_Object Qpost_command_idle_hook, Vpost_command_idle_hook; /* Delay time in microseconds before running post-command-idle-hook. */ -int post_command_idle_delay; +EMACS_INT post_command_idle_delay; /* List of deferred actions to be performed at a later time. The precise format isn't relevant here; we just check whether it is nil. */ @@ -1823,7 +1823,7 @@ safe_run_hooks (hook) /* Number of seconds between polling for input. This is a Lisp variable that can be bound. */ -int polling_period; +EMACS_INT polling_period; /* Nonzero means polling for input is temporarily suppressed. */ @@ -4664,7 +4664,7 @@ Lisp_Object Vdouble_click_time; /* Maximum number of pixels the mouse may be moved between clicks to make a double-click. */ -int double_click_fuzz; +EMACS_INT double_click_fuzz; /* The number of clicks in this multiple-click. */ diff --git a/src/keyboard.h b/src/keyboard.h index d9cc41f6ba1..a6fe2602b00 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -187,7 +187,7 @@ extern Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook; extern int num_input_events; /* Total number of times read_char has returned, outside of macros. */ -extern int num_nonmacro_input_events; +extern EMACS_INT num_nonmacro_input_events; /* Nonzero means polling for input is temporarily suppressed. */ extern int poll_suppress_count; diff --git a/src/lisp.h b/src/lisp.h index 2c4ac62df7c..cc464b95e92 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1068,7 +1068,7 @@ struct Lisp_Intfwd { int type : 16; /* = Lisp_Misc_Intfwd */ int spacer : 16; - int *intvar; + EMACS_INT *intvar; }; /* Boolean forwarding pointer to an int variable. @@ -1598,7 +1598,7 @@ extern void defsubr P_ ((struct Lisp_Subr *)); extern void defvar_lisp P_ ((char *, Lisp_Object *)); extern void defvar_lisp_nopro P_ ((char *, Lisp_Object *)); extern void defvar_bool P_ ((char *, int *)); -extern void defvar_int P_ ((char *, int *)); +extern void defvar_int P_ ((char *, EMACS_INT *)); extern void defvar_per_buffer P_ ((char *, Lisp_Object *, Lisp_Object, char *)); extern void defvar_kboard P_ ((char *, int)); @@ -1653,7 +1653,7 @@ extern struct specbinding *specpdl; extern struct specbinding *specpdl_ptr; extern int specpdl_size; -extern int max_specpdl_size; +extern EMACS_INT max_specpdl_size; #define BINDING_STACK_SIZE() (specpdl_ptr - specpdl) @@ -1763,7 +1763,7 @@ extern int consing_since_gc; /* Threshold for doing another gc. */ -extern int gc_cons_threshold; +extern EMACS_INT gc_cons_threshold; /* Structure for recording stack slots that need marking. */ @@ -2121,7 +2121,7 @@ extern Lisp_Object code_convert_string_norecord P_ ((Lisp_Object, Lisp_Object, int)); /* Defined in charset.c */ -extern int nonascii_insert_offset; +extern EMACS_INT nonascii_insert_offset; extern Lisp_Object Vnonascii_translation_table; EXFUN (Fchar_bytes, 1); EXFUN (Fchar_width, 1); @@ -2289,6 +2289,7 @@ extern void syms_of_insdel P_ ((void)); /* Defined in dispnew.c */ extern Lisp_Object selected_frame; +extern EMACS_INT baud_rate; EXFUN (Fding, 1); EXFUN (Fredraw_frame, 1); EXFUN (Fredraw_display, 0); diff --git a/src/lread.c b/src/lread.c index 186b890fae4..9e2687e272b 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3249,7 +3249,7 @@ defalias (sname, string) void defvar_int (namestring, address) char *namestring; - int *address; + EMACS_INT *address; { Lisp_Object sym, val; sym = intern (namestring); diff --git a/src/sysdep.c b/src/sysdep.c index f79311f837b..b951b545fbe 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -842,7 +842,7 @@ sys_subshell () #ifdef SET_EMACS_PRIORITY { - extern int emacs_priority; + extern EMACS_INT emacs_priority; if (emacs_priority < 0) nice (-emacs_priority); diff --git a/src/termcap.c b/src/termcap.c index b8cf67cc2fe..b87fee48e87 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -323,7 +323,7 @@ tputs (str, nlines, outfun) register int speed; #ifdef emacs - extern int baud_rate; + extern EMACS_INT baud_rate; speed = baud_rate; /* For quite high speeds, convert to the smaller units to avoid overflow. */ diff --git a/src/termchar.h b/src/termchar.h index 1feb8772769..da5413b8f9b 100644 --- a/src/termchar.h +++ b/src/termchar.h @@ -19,7 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -extern int baud_rate; /* Output speed in baud */ +/* extern EMACS_INT baud_rate; */ /* Output speed in baud */ extern int must_write_spaces; /* Nonzero means spaces in the text must actually be output; can't just skip over some columns to leave them blank. */ diff --git a/src/w32term.c b/src/w32term.c index 8cec1b34bd2..07624b9d20a 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -333,7 +333,7 @@ extern int errno; /* A mask of extra modifier bits to put into every keyboard char. */ -extern int extra_keyboard_modifiers; +extern EMACS_INT extra_keyboard_modifiers; /* Enumeration for overriding/changing the face to use for drawing glyphs in x_draw_glyphs. */ diff --git a/src/window.c b/src/window.c index 9dc070bc498..8b9b49f5f12 100644 --- a/src/window.c +++ b/src/window.c @@ -145,8 +145,8 @@ int mode_line_in_non_selected_windows; /* If a window gets smaller than either of these, it is removed. */ -int window_min_height; -int window_min_width; +EMACS_INT window_min_height; +EMACS_INT window_min_width; /* Nonzero implies Fdisplay_buffer should create windows. */ @@ -199,11 +199,11 @@ Lisp_Object Qtemp_buffer_show_hook; /* Fdisplay_buffer always splits the largest window if that window is more than this high. */ -int split_height_threshold; +EMACS_INT split_height_threshold; /* Number of lines of continuity in scrolling by screenfuls. */ -int next_screen_context_lines; +EMACS_INT next_screen_context_lines; /* Incremented for each window created. */ @@ -228,7 +228,7 @@ Lisp_Object Vscroll_preserve_screen_position; static int inhibit_frame_unsplittable; #endif /* 0 */ -extern int scroll_margin; +extern EMACS_INT scroll_margin; extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; diff --git a/src/xdisp.c b/src/xdisp.c index f57269cec03..c591e69b7cc 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -242,7 +242,7 @@ Lisp_Object Vtool_bar_button_margin; /* Thickness of shadow to draw around tool bar buttons. */ -int tool_bar_button_relief; +EMACS_INT tool_bar_button_relief; /* Non-zero means automatically resize tool-bars so that all tool-bar items are visible, and no blank lines remain. */ @@ -383,19 +383,19 @@ int highlight_nonselected_windows; /* If cursor motion alone moves point off frame, try scrolling this many lines up or down if that will bring it back. */ -static int scroll_step; +static EMACS_INT scroll_step; /* Nonzero means scroll just far enough to bring point back on the screen, when appropriate. */ -static int scroll_conservatively; +static EMACS_INT scroll_conservatively; /* Recenter the window whenever point gets within this many lines of the top or bottom of the window. This value is translated into a pixel value by multiplying it with CANON_Y_UNIT, which means that there is really a fixed pixel height scroll margin. */ -int scroll_margin; +EMACS_INT scroll_margin; /* Number of windows showing the buffer of the selected window (or another buffer with the same base buffer). keyboard.c refers to @@ -463,7 +463,7 @@ Lisp_Object Vline_number_display_limit; /* Line width to consider when repositioning for line number display. */ -static int line_number_display_limit_width; +static EMACS_INT line_number_display_limit_width; /* Number of lines to keep in the message log buffer. t means infinite. nil means don't log at all. */ @@ -733,7 +733,7 @@ static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *)); static void extend_face_to_end_of_line P_ ((struct it *)); static int append_space P_ ((struct it *, int)); static int make_cursor_line_fully_visible P_ ((struct window *)); -static int try_scrolling P_ ((Lisp_Object, int, int, int, int)); +static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int)); static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *)); static int trailing_whitespace_p P_ ((int)); static int message_log_check_duplicate P_ ((int, int, int, int)); @@ -8205,7 +8205,7 @@ int debug_delta, debug_delta_bytes; /* Values of window_end_pos and window_end_vpos at the end of try_window_id. */ -int debug_end_pos, debug_end_vpos; +EMACS_INT debug_end_pos, debug_end_vpos; /* Append a string to W->desired_matrix->method. FMT is a printf format string. A1...A9 are a supplement for a variable-length @@ -9517,7 +9517,7 @@ try_scrolling (window, just_this_one_p, scroll_conservatively, scroll_step, temp_scroll_step) Lisp_Object window; int just_this_one_p; - int scroll_conservatively, scroll_step; + EMACS_INT scroll_conservatively, scroll_step; int temp_scroll_step; { struct window *w = XWINDOW (window); diff --git a/src/xselect.c b/src/xselect.c index d21a978060f..03580b782fe 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -154,7 +154,7 @@ static Lisp_Object Vselection_converter_alist; /* If the selection owner takes too long to reply to a selection request, we give up on it. This is in milliseconds (0 = no timeout.) */ -static int x_selection_timeout; +static EMACS_INT x_selection_timeout; /* Utility functions */ diff --git a/src/xterm.c b/src/xterm.c index a6a4e21a531..58a60b59145 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -383,7 +383,7 @@ extern int errno; /* A mask of extra modifier bits to put into every keyboard char. */ -extern int extra_keyboard_modifiers; +extern EMACS_INT extra_keyboard_modifiers; /* The keysyms to use for the various modifiers. */ |