Remove unwanted changes.

2 files changed, 81 insertions, 77 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 15dcea806d0..39f0106235a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-15  Andreas Schwab  <schwab@suse.de>
+
+        * alloc.c (NSTATICS): Increase to 1280.
+
 2002-02-15  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * alloc.c (NSTATICS): Bump to 1026.
@@ -105,7 +109,7 @@
 
         * floatfns.c (Fround): Doc fix.
 
-2002-02-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * sysdep.c (init_system_name): Put unused variable `p' in #if 0.
 
@@ -146,7 +150,7 @@
         (syms_of_keyboard): DEFVAR_LISP it.
         (command_loop_1): Set it, and perform command remapping.
 
-2002-02-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c (recursive_edit_1): Call cancel_hourglass
         unconditionally.
@@ -187,7 +191,7 @@
         of the default face to Qnormal, unless these attributes are
         unspecified.
 
-2002-02-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-02  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c (command_loop_1) [HAVE_X_WINDOWS]:
         Call cancel_hourglass unconditionally.
@@ -209,7 +213,7 @@
 
         * minibuf.c (Fcompleting_read): Doc fix.
 
-2002-01-27  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-27  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * minibuf.c (Fread_from_minibuffer, Fread_command, Fread_function)
         (Fread_variable, Fread_buffer, minibuffer-completion-confirm):
@@ -222,7 +226,7 @@
         * xdisp.c (try_scrolling): Exchange uses of scroll_down_aggressively
         and scroll_up_aggressively.
 
-2002-01-26  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-26  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c (parse_tool_bar_item): Remove duplicated prototypes.
 
@@ -277,7 +281,7 @@
         * xfns.c (x_set_frame_parameters): Just call x_fullscreen_adjust
         if fullscreen is being set.
 
-2002-01-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-21  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * minibuf.c (Fminibuffer_contents)
         (Fminibuffer_contents_no_properties, Fread_from_minibuffer)
@@ -317,7 +321,7 @@
 
         * window.c (MIN_SAFE_WINDOW_HEIGHT): Value now 1.
 
-2002-01-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-20  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * doprnt.c (doprnt1): Fix typos in error call.
 
@@ -343,7 +347,7 @@
         (w32_enable_synthesized_fonts): Change to a boolean.
         (Fw32_send_sys_command): Doc fix.
 
-2002-01-19  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-19  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * dispnew.c (update_frame): Move the variable `tem' to the block
         where it is used.
@@ -363,7 +367,7 @@
         * window.c (enlarge_window): When exceeding size of parent,
         directly delete all the siblings instead of trying to resize it.
 
-2002-01-17  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-17  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * term.c (set_tty_color_mode): Remove unused variable `tem'.
 
@@ -379,7 +383,7 @@
 
         * w32term.c (x_erase_phys_cursor): Ditto.
 
-2002-01-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xterm.c (XTread_socket) [!USE_X_TOOLKIT]: Compute the value of
         `dont_resize' only when used.
@@ -391,12 +395,12 @@
         * xdisp.c (display_mode_element): When computing charpos, depend
         on multibyteness of elt, not the text in field.
 
-2002-01-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * buffer.c (Fkill_all_local_variables): Increment
         `update_mode_lines' only once.
 
-2002-01-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-14  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * lisp.h (adjust_after_replace_noundo)
         (Fupdate_coding_systems_internal): Add prototypes.
@@ -465,7 +469,7 @@
         (syms_of_w32fns): DEFVAR_BOOL it.
         (w32_wnd_proc): Handle new "XBUTTON" messages.
 
-2002-01-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-13  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c (read_key_sequence): Remove unused variable `extra_maps'.
 
@@ -569,7 +573,7 @@
         * editfns.c (Fformat): Update thissize from field_width
         based on the actual width, in the string case.
 
-2002-01-01  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-01  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * charset.h (UNIBYTE_STR_AS_MULTIBYTE_P): Parenthesize assignment
         when used as truth value to prevent gcc warnings.
@@ -682,7 +686,7 @@
         * bytecode.c (Fbyte_code): Use Fstring_make_unibyte
         instead of Fstring_as_unibyte.
 
-2001-12-22  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-22  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         The following changes remove mocklisp support:
 
@@ -755,7 +759,7 @@
         * Makefile.in (lisp, shortlisp): Synchronize with changes to
         lisp/Makefile.in:DONTCOMPILE.
 
-2001-12-18  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-18  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xdisp.c (window_box_height): Do not return negative values.
         From Gerd Moellmann <gerd@gnu.org>.
@@ -852,7 +856,7 @@
 
         * s/gnu-linux.h (GNU_LINUX): Defined.
 
-2001-12-11  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-11  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * macros.c, msdos.c, w16select.c: Change doc-string comments to
         `new style' [w/`doc:' keyword].
@@ -862,7 +866,7 @@
         * w32menu.c (w32_free_submenu_strings): Clear menu item struct
         before using.
 
-2001-12-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * dosfns.c: Change doc-string comments to `new style' [w/`doc:'
         keyword].
@@ -883,7 +887,7 @@
         Lisp_Object.
         (w32_free_submenu_strings): Only free owner-drawn strings.
 
-2001-12-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * COPYING: Moved back.
 
@@ -982,11 +986,11 @@
 
         * eval.c: Use standard syntax for usage in docstrings.
 
-2001-12-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xdisp.c (syms_of_xdisp): Make `tool-bar-button-relief` an option.
 
-2001-12-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-02  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xterm.c (x_draw_image_relief): Use predefined macro instead of
         constant when the value of `tool_bar_button_relief' is negative.
@@ -1082,7 +1086,7 @@
         * w32term.c: Merged changes from xterm.c.
         * w32fns.c: Merged changes from xfns.c.
 
-2001-11-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-29  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * COPYING: Removed.
 
@@ -1092,7 +1096,7 @@
         extra extra slot.
         (detect_coding_mask): Fix call of detect_coding_iso2022.
 
-2001-11-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-29  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * fileio.c (file-name-coding-system)
         (default-file-name-coding-system): Doc fix (links to referenced
@@ -1139,7 +1143,7 @@
         * xterm.c (x_draw_glyphs): Don't call notice_overwritten_cursor if
         OVERLAPS_P.
 
-2001-11-28  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-28  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xdisp.c (message_dolog): Remove unused variables `gcpro2',
         `gcpro3' and `gcpro4'.
@@ -1256,7 +1260,7 @@
         * msdos.c (IT_clear_screen): If the frame's faces are not yet
         realized, use the initial screen colors to clear the screen.
 
-2001-11-23  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-23  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * textprop.c (Fset_text_properties): Remove unused variables
         `unchanged', `prev_changed', `s' and `len'.
@@ -1384,7 +1388,7 @@
 
         * puresize.h (BASE_PURESIZE): Increase to 750000.
 
-2001-11-18  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-18  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * frame.c (Fframe_live_p): Doc fix.
 
@@ -1434,7 +1438,7 @@
         (Fwrite_region): Split the call to build_annotations into two
         calls to build_annotations and build_annotations_2.
 
-2001-11-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * sysdep.c (wait_for_kbd_input) [VMS]: Do not call
         clear_waiting_for_input with argument.
@@ -1606,7 +1610,7 @@
 
         * print.c (prin1, print): Doc fix.
 
-2001-11-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-14  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * fontset.h: Remove declarations of variables
         `Vhighlight_wrong_size_font' and `Vclip_large_size_font'.
@@ -1618,7 +1622,7 @@
 
         * w32fns.c: Doc fix.
 
-2001-11-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-13  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xfaces.c (Fface_attributes_as_vector): Doc fix.
 
@@ -1680,7 +1684,7 @@
         * w32fns.c: Don't define max.
         (Fx_open_connection): Only execute once.
 
-2001-11-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-12  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * ccl.c: Change macros to use do-while block instead of if-else.
         Use braces to follow GNU Coding Standards.
@@ -1718,7 +1722,7 @@
         * unexelf.c (unexec): Use mmap/munmap to allocate buffers
         instead of malloc/free.
 
-2001-11-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xfaces.c (merge_face_vectors): Use braces to follow GNU
         Coding Standards.
@@ -1737,7 +1741,7 @@
         * w32term.c (x_display_and_set_cursor): Do not move system caret
         if cursor_glyph is NULL.
 
-2001-11-07  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-07  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keymap.c (access_keymap): Fix compilation error.
 
@@ -1745,7 +1749,7 @@
 
         * xfns.c (x_set_frame_parameters): Avoid infinite recursion.
 
-2001-11-07  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-07  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * intervals.c (graft_intervals_into_buffer):
         Remove #ifdef'd-out code.
@@ -1766,7 +1770,7 @@
         * keyboard.c (make_lispy_event): Check integerness and fix
         Lisp_Object/int mixup.
 
-2001-11-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * fns.c (copy_hash_table): Remove unused variable `v'.
 
@@ -1804,7 +1808,7 @@
         * unexelf.c (unexec): Don't use `mmap'.  Instead, read and write
         the program image directly.
 
-2001-11-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-05  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * buffer.h (Fbuffer_local_value): Add prototype.
 
@@ -1840,7 +1844,7 @@
         * xdisp.c (Qcursor_in_non_selected_windows): New variable.
         (syms_of_xdisp): Initialize it.
 
-2001-11-04  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-04  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xfns.c (Fx_create_frame): Doc fix.
 
@@ -1874,7 +1878,7 @@
 
         * syssignal.h (sigunblock): Don't define if already defined.
 
-2001-11-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-02  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * eval.c (debugger_may_continue, Vdebug_ignored_errors)
         (call_debugger, Fcondition_case, skip_debugger, unbind_to):
@@ -1927,7 +1931,7 @@
 
         * textprop.c (Fget_char_property): Doc fix.
 
-2001-11-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-02  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * process.c (Fstart_process): Add usage to doc-string.
 
@@ -1950,7 +1954,7 @@
         bindings along with or instead of the buffer local map.
         Make the overriding maps override what they should.
 
-2001-11-01  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-01  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * window.c (grow_mini_window): Fix typo in comment.
 
@@ -1967,7 +1971,7 @@
         * xfaces.c (Finternal_set_lisp_face_attribute_from_resource):
         Handle :box so that it is possible to specify sexprs.
 
-2001-11-01  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-01  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xfaces.c (Finternal_merge_in_global_face): Reindent.
         (Fface_font): Ditto.
@@ -1980,7 +1984,7 @@
 
         * s/hpux11.h: New file.
 
-2001-10-31  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-31  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * emacs.c (USAGE1): Show command line option --no-window-system
         instead of --no-windows in usage.
@@ -2006,7 +2010,7 @@
 
         * dispextern.h (struct face) <colors_copied_bitwise_p>: New member.
 
-2001-10-31  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-31  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * marker.c, mocklisp.c: Change doc-string comments to `new style'
         [w/`doc:' keyword].
@@ -2015,7 +2019,7 @@
 
         * fns.c (require_unwind): Return Lisp_Object.
 
-2001-10-31  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-31  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c (lucid-menu-bar-dirty-flag): Doc fix.
         (last-input-char): Revert doc-string to be the same as the
@@ -2109,7 +2113,7 @@
 
         * window.c (Fscroll_left, Fscroll_right): Doc fix.
 
-2001-10-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-29  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c (Finput_pending_p): Fix typo in doc-string.
         (echo-area-clear-hook): Properly DEFVAR_LISP and staticpro it.
@@ -2144,7 +2148,7 @@
         * xfns.c (x_build_heuristic_mask): Fix a bug not incrementing
         a loop counter.
 
-2001-10-28  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-28  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * emacs.c: Use argv[0] instead of emacs when -t was specified.
 
@@ -2184,7 +2188,7 @@
 
         * w32term.c (note_mouse_highlight): Clear old help_echo.
 
-2001-10-27  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-27  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xterm.c: Fix typo in a comment.
 
@@ -2271,12 +2275,12 @@
         * xfaces.c (Fface_attributes_as_vector): New function.
         (syms_of_xfaces): Defsubr it.
 
-2001-10-24  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-24  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * dispnew.c (sync_window_with_frame_matrix_rows): Remove unused
         variable `area'.
 
-2001-10-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-25  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * search.c (scan_newline): Remove unused variable `selective_display'.
 
@@ -2317,7 +2321,7 @@
         * xterm.c (XTset_vertical_scroll_bar) [!USE_TOOLKIT_SCROLL_BARS]:
         Fix clearing of area not covered by scroll bar.
 
-2001-10-24  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-24  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xterm.c: (x_insert_glyphs): Remove unused variables `real_end'
         and `real_start'.
@@ -2344,7 +2348,7 @@
         (try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited.
         (syms_of_xdisp) [GLYPH_DEBUG]:  DEFVAR_BOOL the variables.
 
-2001-10-24  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-24  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xmenu.c: Spell the name of Emacs properly (GNU Emacs instead of
         gnuemacs).
@@ -2397,7 +2401,7 @@
         (x_draw_phys_cursor_glyph): Save state of w->phys_cursor_on_p
         around call to x_draw_glyphs.
 
-2001-10-23  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-23  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * syntax.c (modify-syntax-entry): Fix argument names (use CHAR
         instead of C) and usage.
@@ -2418,7 +2422,7 @@
         * xdisp.c (display_line): Fix computation of continuation lines
         width for TABs.
 
-2001-10-22  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-22  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xdisp.c (build_desired_tool_bar_string): Remove unused variable
         `Qlaplace'.
@@ -2470,7 +2474,7 @@
         * mocklisp.c (Finsert_string, Fml_if, Fml_provide_prefix_argument)
         (Fml_prefix_argument_loop): Likewise.
 
-2001-10-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-21  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * fileio.c (Finsert_file_contents): Remove unused variable `gap_size'.
 
@@ -2598,7 +2602,7 @@
         * callproc.c (Fcall_process_region, Fcall_process): Likewise.
         * alloc.c (Fmake_byte_code, Fvector, Flist): Likewise.
 
-2001-10-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-21  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * buffer.c: Reindent DEFUNs and DEFVARs with doc: keywords.
 
@@ -2613,7 +2617,7 @@
 
         * (Version 21.1 released.)
 
-2001-10-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-20  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xfns.c (x_laplace_read_row, x_laplace_write_row): Prototypes removed.
 
@@ -2857,7 +2861,7 @@
         (x_handle_property_notify, x_get_foreign_selection)
         (x_handle_selection_notify): Use XSETCAR.
 
-2001-10-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * buffer.c: Put doc strings in comments.
 
@@ -2867,7 +2871,7 @@
 
         * fns.c (Vafter_load_alist): Declare extern (w32 build problem).
 
-2001-10-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * process.c (process-inherit-coding-system-flag)
         (get-buffer-process): Do not confuse make-docfile with doc strings
@@ -2885,7 +2889,7 @@
         * window.c (select_window_1): Unfreeze window start.  Remove a
         doubled test for WINDOW being live.
 
-2001-10-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * fns.c (Fmapconcat): Fix typo in a doc string.
 
@@ -2896,7 +2900,7 @@
         * xterm.c (x_draw_glyph_string): Restore clipping after
         drawing box.
 
-2001-10-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * callint.c (prefix-arg, current-prefix-arg): Fix typo in a doc string.
 
@@ -2926,7 +2930,7 @@
         (in_ellipses_for_invisible_text_p, handle_invisible_prop):
         Use new retval of TEXT_PROP_MEANS_INVISIBLE.
 
-2001-10-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-14  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * lisp.h (Ftop_level): Add prototype.
 
@@ -3021,7 +3025,7 @@
         * lread.c (syms_of_lread) <load-suffixes>: Fix last change:
         multi-line strings without a trailing "\n\".
 
-2001-10-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-12  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * floatfns.c: float_error() is defined iff FLOAT_CATCH_SIGILL is
         defined.
@@ -3178,7 +3182,7 @@
         * sysdep.c (child_setup_tty) [HAVE_TERMIO || HAVE_TERMIOS]:
         Clear ICRNL and INLCR.  From Daiki Ueno <ueno@unixuser.org>.
 
-2001-10-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * keyboard.c: Don't define min/max.
 
@@ -3195,7 +3199,7 @@
 
         * puresize.h (BASE_PURESIZE): Increase to 725000.
 
-2001-10-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * xfaces.c (free_frame_menubar): Add prototype.
 
@@ -3471,7 +3475,7 @@
 
         * frame.c (syms_of_frame) <default-minibuffer-frame>: Doc fix.
 
-2001-09-28  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-09-28  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * s/gnu-linux.h: Fix a typo in comment.
 
@@ -3947,7 +3951,7 @@
 
         * xterm.c (x_dump_glyph_string): Put in #if GLYPH_DEBUG.
 
-2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * alloc.c (init_stack): Remove declaration.
 
diff --git a/src/alloc.c b/src/alloc.c
index 5eafa21c2c7..2592d71d22c 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.  */
 
-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;
+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;
 
 /* Number of bytes of consing since GC before another GC should be done. */
 
-EMACS_INT gc_cons_threshold;
+int gc_cons_threshold;
 
 /* Nonzero during GC.  */
 
@@ -155,8 +155,8 @@ int malloc_sbrk_unused;
 
 /* Two limits controlling how much undo information to keep.  */
 
-EMACS_INT undo_limit;
-EMACS_INT undo_strong_limit;
+int undo_limit;
+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.. */
 
-EMACS_INT pure_bytes_used;
+int pure_bytes_used;
 
 /* If nonzero, this is a warning delivered by malloc and not yet
    displayed.  */