--- a/src/ChangeLog	Mon Aug 13 10:50:41 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:51:02 2007 +0200
@@ -1,3 +1,77 @@
+1999-03-12  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.66 is released
+
+1999-03-08  Andy Piper  <andy@xemacs.org>
+
+	* menubar-msw.c (displayable_menu_item): correct off-by-one &
+ 	handling.
+
+1999-03-08  Martin Buchholz  <martin@xemacs.org>
+
+	* mule-charset.c:
+	(non_ascii_valid_char_p):
+	(lookup_composite_char):
+	(composite_char_string):
+	(make-composite-char):
+	(composite-char-string):
+	(syms_of_mule_charset): 
+	(complex_vars_of_mule_charset): 
+	* mule-charset.h (LEADING_BYTE_COMPOSITE):
+	(CHAR_LEADING_BYTE):
+	(MAKE_CHAR):
+	* file-coding.h (CODING_STATE_COMPOSITE):
+	(CODING_STATE_ISO2022_LOCK):
+	(iso_esc_flag):
+	(LEADING_BYTE_COMPOSITE):
+	* file-coding.c (struct iso2022_decoder):
+	(decoding_closer):
+	(reset_iso2022):
+	(parse_iso2022_esc):
+	(encode_coding_iso2022):
+	#ifdef out all composite character support using 
+	#ifdef ENABLE_COMPOSITE_CHARS 
+
+	* alloc.c: Define lrecord_coding_system only if ! FILE_CODING
+
+1999-03-07  Martin Buchholz  <martin@xemacs.org>
+
+	* systime.h: Unix98 says sys/time.h should define select(), but
+	some systems define that in unistd.h.  So include that file always.
+
+	* free-hook.c (blocktype): Add gcpro5_type to blocktype.
+	(log_gcpro): Remove unused variable FRAME.
+	(show_gcprohist): Ansify.
+	Comment the #endif's
+
+1999-02-18  Martin Buchholz  <martin@xemacs.org>
+
+	* opaque.c (print_opaque):
+	(sizeof_opaque):
+	(equal_opaque):
+	(hash_opaque):
+	Egcs 1.1.1 seems to have a bug where
+	INTP (p->size_or_chain)
+	will crash XEmacs.  Fix by introducing intermediate variable.
+
+1999-03-05  Martin Buchholz  <martin@xemacs.org>
+
+	* alloc.c: (disksave_object_finalization):
+	Set all the *-load-path variables to
+	nil, not just load-path itself.  This gets the locate-file hash
+	tables garbage collected BEFORE dump, and has the side effect of
+	preventing crashes on OSF4.0+egcs.
+
+	* alloc.c:
+	* gdbinit:
+	* dbxrc:
+	- Clean up gdb/dbx debugging support.
+	- Storing an EMACS_INT in an enum is not 64-bit clean!
+	- So change the enum to a set of separate variables.
+	- Add test cases to help debug the debugging support!
+	- Add `lisp-shadows' and `run-temacs' targets for dbx.
+	- Both dbx and gdb have been tested now.
+
 1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.65 is released
@@ -29,9 +103,15 @@
 
 	* glyphs-x.c (convert_EImage_to_XImage): Remove unused variable.
 
+1999-02-18  Martin Buchholz  <martin@xemacs.org>
+
+	* file-coding.c (convert_to_external_format):
+	(convert_from_external_format):
+	Rewrite code to work around a DEC cc compiler bug.
+
 1999-02-17  Kazuo Oishi <oishi@ae.agr.yamaguchi-u.ac.jp>
 
-	* glyphs-x.c (cononvert_EImage_to_XImage): correct 
+	* glyphs-x.c (cononvert_EImage_to_XImage): correct
 	bytes per pixel counting.
 
 1999-02-15  Andy Piper  <andy@xemacs.org>
@@ -46,7 +126,7 @@
 
 1999-02-02  Gleb Arshinov  <gleb@cs.stanford.edu>
 
-	* process-nt.c (nt_send_process): 
+	* process-nt.c (nt_send_process):
  	Fix for process-send-region/process-send-string breaking when size
 	of the input > 128 chars: change maximum chunk size for process
 	stream from 512 to 128, thus guaranteeing that ntpipe_shove_writer
@@ -76,7 +156,7 @@
 
 1998-12-28  Martin Buchholz  <martin@xemacs.org>
 
-	* buffer.c (init_initial_directory): 
+	* buffer.c (init_initial_directory):
 	- use correct conversions between internal and external format.
 	(directory_is_current_directory): new function
 	(init_buffer): convert initial_directory to internal format.
@@ -182,7 +262,7 @@
 
 	* process-unix.c (unix_create_process): handle properly
 	Vfile_name_coding_system for converting the program and directory
-	names. 
+	names.
 
 1998-11-27  SL Baur  <steve@altair.xemacs.org>
 
@@ -278,7 +358,7 @@
 
 1998-10-07  Jonathan Harris  <jhar@tardis.ed.ac.uk>
 
-	* scrollbar-msw.c: Use the same vertical scrollbar drag hack as 
+	* scrollbar-msw.c: Use the same vertical scrollbar drag hack as
 	  is used for Motif or Lucid scrollbars under X.
 
 1998-10-08  Pierre Wendling  <pw@ebc.vbe.dec.com>
@@ -321,9 +401,9 @@
 	  mswindows_enumerate_fonts() function in objects-msw.c instead
 	  of font_enum_callback_1() to enumerate fonts.
 
-	  font_enum_callback_1() and _2() moved to objects-msw.c. 
-
-	* faces.c (complex_vars_of_faces): Make the mswindows default 
+	  font_enum_callback_1() and _2() moved to objects-msw.c.
+
+	* faces.c (complex_vars_of_faces): Make the mswindows default
 	  face font fully specified and provide some fallbacks.
 
 	* objects-msw.c: font_enum_callback_1() and _2() moved here
@@ -351,7 +431,7 @@
 	  sig_enable_code_end() since they are now redundant.
 
 	  send_signal() and enable_child_signals(): Don't try to work
-	  out the end of the code fragments passed to 
+	  out the end of the code fragments passed to
 	  run_in_other_process()
 
 1998-09-10  Kazuyuki IENAGA  <ienaga@jsys.co.jp>
@@ -374,7 +454,7 @@
 
 	* process-unix.c (unix_create_process): Reset SIGHUP handler to
 	SIG_DFL. We now try to conserve any inherted SIG_IGN settings
-	in init_signals_very_early. However these should not be passed 
+	in init_signals_very_early. However these should not be passed
 	on to children attached to the new pty.
 
 1998-08-28  Andy Piper  <andyp@parallax.co.uk>
@@ -384,7 +464,7 @@
 1998-09-07  Jonathan Harris  <jhar@tardis.ed.ac.uk>
 
 	* fileio.c (file-name-directory, file_name_as_directory):
-	  Don't call CORRECT_DIR_SEPS, even when #defined WINDOWSNT. 
+	  Don't call CORRECT_DIR_SEPS, even when #defined WINDOWSNT.
 
 1998-09-05  SL Baur  <steve@altair.xemacs.org>
 
@@ -405,7 +485,7 @@
 
 	* frame-x.c (x_delete_frame): Flush the X output buffer after
 	calling XtDestroyWidget to ensure that the windows are really
-	killed right now. 
+	killed right now.
 
 1998-08-26  Hrvoje Niksic  <hniksic@srce.hr>
 
@@ -459,9 +539,9 @@
 1998-08-07 Matt Stupple <matts@tibco.com>
 
 	* ntproc.c: don't wait on char_consumed at thread entry.
-	Additionally, to get the 'process' marked as finished, ensure 
-	that the CHILD_ACTIVE macro returns false, so before exiting 
-	close char_avail and set it to NULL, and close other handles 
+	Additionally, to get the 'process' marked as finished, ensure
+	that the CHILD_ACTIVE macro returns false, so before exiting
+	close char_avail and set it to NULL, and close other handles
 	to reduce handle leak problems.
 
 1998-08-09  Jonathan Harris  <jhar@tardis.ed.ac.uk>
@@ -510,7 +590,7 @@
 1998-07-16  Jan Vroonhof  <vroonhof@math.ethz.ch>
 
 	* event-Xt.c (x_to_emacs_keysym): Return nil for modifier keysyms.
-	(x_event_to_emacs_event): Let x_to_emacs_keysym check for modifier 
+	(x_event_to_emacs_event): Let x_to_emacs_keysym check for modifier
 	keys thus no longer considering all keysyms on a key.
 
 1998-07-27  SL Baur  <steve@altair.xemacs.org>
@@ -609,7 +689,7 @@
 	* glyphs-msw.c (mswindows_resource_normalize): Qresource ->
 	Qmswindows_resource.
 	From Jonathan Harris <jhar@tardis.ed.ac.uk>
-	
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
 	* general.c (syms_of_general): Add defsymbol for Qresource.
@@ -710,7 +790,7 @@
 
 	* eval.c (run_hook_with_args_in_buffer): Check
 	  default (non-buffer-local) value of hook for
-	  nil before treating it as a function.  Don't initialize 
+	  nil before treating it as a function.  Don't initialize
 	  the `globals' variable twice.
 
 1998-06-24  Jonathan Harris  <jhar@tardis.ed.ac.uk>
@@ -741,7 +821,7 @@
 
 	* eval.c (run_hook_with_args_in_buffer): Don't treat
 	  the default value of a buffer local hook as a list of
-	  hooks unless it is both a cons and the car of that cons 
+	  hooks unless it is both a cons and the car of that cons
 	  is not Qlambda.
 
 1998-06-29  SL Baur  <steve@altair.xemacs.org>
@@ -771,7 +851,7 @@
 	* winslots.h: Rename.
 
 	* window.c (specifier_vars_of_window): Renamed
-	vertical-divider-draggable-p to vertical-divider-always-visible-p, 
+	vertical-divider-draggable-p to vertical-divider-always-visible-p,
 	as suggested by Ben Wing.
 	(specifier_vars_of_window): Fix docstrings.
 
@@ -807,7 +887,7 @@
 	Set last_known_column_point to the buffer position for
 	which the column was requested, not buffer's point.
 
-	* redisplay.c (decode_mode_spec): for current-column, show 
+	* redisplay.c (decode_mode_spec): for current-column, show
 	window's point's column, not buffer's point's column.
 
 1998-06-23  Andy Piper  <andyp@parallax.co.uk>
@@ -906,7 +986,7 @@
 	mswindows_size_frame_internal function and size frame if frame
 	parameters not just if init is finished - WM_SIZE happens too
 	early for some specs. (mswindows_size_frame_internal): new
-	function abstracted from mswindows_set_frame_properties. 
+	function abstracted from mswindows_set_frame_properties.
 	(Vmswindows_use_system_frame_size_defaults):
 	new variable controls whether to allow the system to pick frame
 	size defaults, defaults to nil.
@@ -930,7 +1010,7 @@
 
 1998-06-05  Hrvoje Niksic  <hniksic@srce.hr>
 
-	* eldap.c (Fldap_search_internal): Use build_ext_string instead of 
+	* eldap.c (Fldap_search_internal): Use build_ext_string instead of
 	build_string to avoid crashes under Mule.
 
 1998-06-13  Andy Piper  <andyp@parallax.co.uk>
@@ -1123,7 +1203,7 @@
 
 	* glyphs-msw.c (read_bitmap_data) (NextInt)
 	(read_bitmap_data_from_file): new functions copied from Xmu
-	sources. 
+	sources.
 	(xbm_create_bitmap_from_data) from Ben <ben@666.com> convert
 	inline data to an mswindows bitmap.
 	(init_image_instance_from_xbm_inline) (xbm_instantiate_1)
@@ -1169,7 +1249,7 @@
 	Added prototype for mswindows_enqueue_misc_user_event().
 
 	* menubar-msw.c (mswindows_handle_wm_command): Use
-	mswindows_enqueue_misc_user_event(). 
+	mswindows_enqueue_misc_user_event().
 
 	* toolbar-msw.c (mswindows_handle_toolbar_wm_command): Ditto.
 
@@ -1182,11 +1262,11 @@
 1998-05-29  Greg Klanderman  <greg@alphatech.com>
 
 	* window.c (Fwindow_displayed_text_pixel_height): was relying on
-	incorrect semantics of vmotion_pixels which has been fixed.  don't 
+	incorrect semantics of vmotion_pixels which has been fixed.  don't
 	use it anymore as it can't easily be used.
 
 	* indent.c (vmotion_pixels): fix off by one bug moving up.  also
-	the motion was reported incorrectly if you tried to go past end of 
+	the motion was reported incorrectly if you tried to go past end of
 	buffer.
 
 1998-05-30  Kirill M. Katsnelson  <kkm@kis.ru>
@@ -1212,11 +1292,11 @@
 
 1998-05-28  Martin Buchholz  <martin@xemacs.org>
 
-	* alloc.c (dbg_constants): 
+	* alloc.c (dbg_constants):
 	* dbxrc:
 	* gdbinit:
 	Remove toolbar_data debugging code, since that lrecord has
-	also been removed. 
+	also been removed.
 
 Wed May 27, 1998  Darryl Okahata  <darrylo@sr.hp.com>
 
@@ -1247,7 +1327,7 @@
 	* fileio.c: replaced egetenv("HOME") with calls to the new
 	  get_home_directory().
 
-	* lisp.h: Added function prototypes for uncache_home_directory() 
+	* lisp.h: Added function prototypes for uncache_home_directory()
 	  and get_home_directory(), along with lisp prototypes for
 	  Fuser_home_directory() and friends.
 
@@ -1264,7 +1344,7 @@
 
 	* event-msw.c (mswindows_wnd_proc, WM_KEYDOWN): Unconditionally
 	remove MOD_SHIFT from ASCII characters.
-	(mswindows_wnd_proc, WM_KEYDOWN): Do not activate the menubar when 
+	(mswindows_wnd_proc, WM_KEYDOWN): Do not activate the menubar when
 	F10 is pressed.
 
 1998-05-24  Oliver Graf <ograf@fga.de>
@@ -1301,10 +1381,10 @@
 	(syms_of_indent): DEFSUBR.
 	* lisp.h: declaration for vmotion_pixels().
 
-	* indent.c (Fvertical_motion): Add optional third argument PIXELS, 
+	* indent.c (Fvertical_motion): Add optional third argument PIXELS,
 	to request returning motion in pixels.
 	(Fvertical_motion_pixels): Remove, functionality merged into
-	Fvertical_motion. 
+	Fvertical_motion.
  	* window.c (window_scroll): call Fvertical_motion with 3 arguments.
 	(Fmove_to_window_line): ditto.
 	* lisp.h: Change declaration for Fvertical_motion.
@@ -1318,7 +1398,7 @@
 	Tooltalk_Message_plist_str and Tooltalk_Pattern_plist_str
 
 1998-05-27  Andy Piper  <andyp@parallax.co.uk>
-		
+
 	* faces.c: create a new 3d_object_face, make modeline and
 	vertical_divider faces fallback to this rather than the default.
 
@@ -1366,9 +1446,9 @@
 	* This patch is to fix compilation warnings under Windows.
 
 	* s/windowsnt.h: Encapsulate getpid with sys_getpid.
-	Added prototypes for FSF inherited functions, with which XEmacs is 
+	Added prototypes for FSF inherited functions, with which XEmacs is
 	sprinkled thoroughly.
-	Removed some #if 0 code. Bracketed some more definitions, probably 
+	Removed some #if 0 code. Bracketed some more definitions, probably
 	related to Visual C versions prior to 4 (we do not support them).
 
 	* sysfloat.h (logb): Finally, get logb() prototyped.
@@ -1384,10 +1464,10 @@
 	vars_of_dired_mswindows and init_ntproc (Grrr).
 
 	* realpath.c: Added Windows specific include files.
-	(xrealpath): Conditionalized declaration of some auto variables on 
+	(xrealpath): Conditionalized declaration of some auto variables on
 	S_IFLNK, to avoid warnings.
 
-	* ntproc.c: Disabled some compiler warnings. This file is going to 
+	* ntproc.c: Disabled some compiler warnings. This file is going to
 	die, so I have not cleaned it up much.
 	(set_process_dir): Const parameter.
 	(Fwin32_short_file_name): Down CHECK_* macros to one argument.
@@ -1463,7 +1543,7 @@
 
 	* symsinit.h: Prototyped the above functions.
 
-	* dialog-x.c (x_popup_dialog_box): Moved dialog descriptor consistency 
+	* dialog-x.c (x_popup_dialog_box): Moved dialog descriptor consistency
 	checks to dialog.c...
 
 	* dialog.c (Fpopup_dialog_box): ...right here. Added more checks: a
@@ -1516,7 +1596,7 @@
 
 	* EmacsFrame.c (Xt_StringToScrollBarPlacement):  Added support for
 	{top,bottom}-{left,right} values in addition to
-	{top,bottom}_{left,right}. 
+	{top,bottom}_{left,right}.
 
 1998-05-18  Hrvoje Niksic  <hniksic@srce.hr>
 
@@ -1527,10 +1607,10 @@
 
 1998-05-19  Martin Buchholz  <martin@xemacs.org>
 
-	* unexhp9k800.c: 
-	* sound.c (vars_of_sound): 
-	* sysdep.c (reset_sigio_on_device): 
-	* window.c (window_bottom_gutter_height): 
+	* unexhp9k800.c:
+	* sound.c (vars_of_sound):
+	* sysdep.c (reset_sigio_on_device):
+	* window.c (window_bottom_gutter_height):
 	unexhp9k800.c:258: warning: implicit declaration of function
 	`calculate_checksum'
 	sound.c:604: warning: implicit declaration of function `vars_of_hpplay'
@@ -1560,7 +1640,7 @@
 	* frame-x.c (x_update_frame_external_traits): Start preprocessor
 	directives in column 1.
 
-	* search.c (skip_chars): Avoid using xzero with arrays, since some 
+	* search.c (skip_chars): Avoid using xzero with arrays, since some
 	compilers get confused by the construct &array.
 
 1998-05-18  Kirill M. Katsnelson  <kkm@kis.ru>
@@ -1584,7 +1664,7 @@
 1998-05-18  Kirill M. Katsnelson  <kkm@kis.ru>
 
 	* objects-msw.c (mswindows_initialize_font_instance): Use ANSI
-	charset when creating font. 
+	charset when creating font.
 	(mswindows_initialize_color_instance): Do not create brush along
 	with a color.
 	(mswindows_finalize_color_instance): Do not delete it then.
@@ -1608,7 +1688,7 @@
 	(compute_frame_toolbars_data): Removed unused second parameter;
 	Adjusted callers of this static function throughout the file.
 	(init_frame_toolbars): Initialize current_toolbar_size.
-	(update_frame_toolbars): Use DEVICE_SUPPORTS_TOOLBARS_P instead of 
+	(update_frame_toolbars): Use DEVICE_SUPPORTS_TOOLBARS_P instead of
 	what is its current expansion, for clarity.
 	(init_frame_toolbars): Ditto.
 	(init_device_toolbars): Ditto.
@@ -1653,7 +1733,7 @@
 
 	* emacs.c (main_1): Call syms_of_process_nt()
 
-	* process-nt.c: Quote process arguments by a call to Lisp function 
+	* process-nt.c: Quote process arguments by a call to Lisp function
 	`nt-quote-process-args'.
 	(syms_of_process_nt): New function.
 	(nt_send_process): Flush data stream after each write, to avoid
@@ -1678,7 +1758,7 @@
 
 1998-05-17  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>
 
-	* s/aix4-2.h (ALIGN_DATA_RELOC): Undefined to support new unexaix.c. 
+	* s/aix4-2.h (ALIGN_DATA_RELOC): Undefined to support new unexaix.c.
 
 	* s/aix3-1.h (ALIGN_DATA_RELOC): Defined to support new unexaix.c.
 
@@ -1750,7 +1830,7 @@
 
 	* bufslots.h: Removed buffer_file_type slot.
 
-	* buffer.c (complex_vars_of_buffer): Removed buffer_file_type from 
+	* buffer.c (complex_vars_of_buffer): Removed buffer_file_type from
 	buffer local flags.
 	(complex_vars_of_buffer): Removed buffer-file-type variable and
 	its default reference.
@@ -1779,9 +1859,9 @@
 	(x_divider_width): ditto.
 
 	* window.c (specifier_vars_of_window): new specifiers:
-	vertical-divier -line-width and -spacing. 
+	vertical-divier -line-width and -spacing.
 	(vertical_divider_global_width_changed): formerly known as
-	vertical_divider_shadow_thickness_changed. 
+	vertical_divider_shadow_thickness_changed.
 
 	* winslots.h: new slots: vertical_specifier _line_width and
 	_spacing. Plus corrected a comment typo.
@@ -1794,7 +1874,7 @@
 	(console_type_create_stream): And declaration for it.
 
 	* redisplay.c (pixel_to_glyph_translation): Use
-	window_divider_width() instead of divider_width redisplay method. 
+	window_divider_width() instead of divider_width redisplay method.
 	(pixel_to_glyph_translation): Fix top divider edge calculation
 	when scrollbar is on top.
 
@@ -1804,7 +1884,7 @@
 	(specifier_vars_of_window): For	vertical-divider-{spacing,line-width}
 	specifiers, set fallback values differently on TTYs, and document
 	the behavior of these on TTYs in the docstrings.
-	
+
 	* scrollbar.c (update_scrollbar_instance): Use
 	window_divider_width() instead of divider_width redisplay method.
 
@@ -1859,7 +1939,7 @@
 
 	* emacs.c (main_1): Call console_type_create_dialog_x().
 
-	* dialog-x.c (x_popup_dialog_box): Old Fpopup_dialog_box converted 
+	* dialog-x.c (x_popup_dialog_box): Old Fpopup_dialog_box converted
 	into this device method.
 	(console_type_create_dialog_x): New function.
 
@@ -1867,7 +1947,7 @@
 	(syms_of_dialog): Defsubr it.
 
 	* console.h (struct console_methods): Declared
-	popup_dialog_box_method(). 
+	popup_dialog_box_method().
 
 	* symsinit.h: Defined console_type_create_dialog_{x,mswindows}
 
@@ -1905,10 +1985,10 @@
 	** Renamed window-divider-map => vertical-divider-map
 	and event-over-divider-p => event-over-vertical-divider-p,
 	in the following files/functions:
-	* events.h: 
-	* events.c (Fevent_over_divider_p): 
-	* keymap.c (get_relevant_keymaps): 
-	(vars_of_keymap): 
+	* events.h:
+	* events.c (Fevent_over_divider_p):
+	* keymap.c (get_relevant_keymaps):
+	(vars_of_keymap):
 
 	* redisplay.h (OVER_V_DIVIDER): Renamed so from OVER_DIVIDER.
 
@@ -1931,7 +2011,7 @@
 
 	* window.h: Prototype invalidate_vertical_divider_cache_in_window.
 	(struct window): Added need_vertical_divider_p and
-	need_vertical_divider_valid_p. 
+	need_vertical_divider_valid_p.
 
 	* winslots.h: Added vertical_divider_draggable_p slot.
 
@@ -1987,7 +2067,7 @@
 	thickness is negative.
 
 	* console-stream.c (stream_divider_width): pass a struct window *
-	argument. 
+	argument.
 
 	* redisplay-tty.c (tty_divider_width): ditto.
 
@@ -1996,12 +2076,12 @@
 	* redisplay.c (generate_modeline): ittod.
 
 	* scrollbar.c (update_scrollbar_instance): ttido.
-	
-	* redisplay-msw.c (mswindows_divider_width): ottid. 
+
+	* redisplay-msw.c (mswindows_divider_width): ottid.
 	WARNING: this enables to compile, but the feature is not functional.
 
 	* window.h (struct window): new field
-	vertical_divider_shadow_thickness. 
+	vertical_divider_shadow_thickness.
 
 	* window.c (specifier_vars_of_window): new specifier
 	vertical-divider-shadow-thickness.
@@ -2052,7 +2132,7 @@
 1998-05-10  Andy Piper  <andyp@parallax.co.uk>
 
 	* redisplay-msw.c (mswindows_output_dibitmap_region): make sure
-	multiple bitmaps are output vertically as well as horizontally.  
+	multiple bitmaps are output vertically as well as horizontally.
 	* (mswindows_output_dibitmap): don't cope with bitmap boundaries
 	crossing lines this is handled by
 	mswindows_output_dibitmap_region.
@@ -2061,7 +2141,7 @@
 
 	* inline.c: Include eldap.h
 
-	* menubar-x.c (x_update_frame_menubar_internal): 
+	* menubar-x.c (x_update_frame_menubar_internal):
 	Remove: unused variable `container'
 
 1998-05-11  Martin Buchholz  <martin@xemacs.org>
@@ -2069,8 +2149,8 @@
 	* s/aix4.h: Allow AIX 4.3 XEmacs to compile cleanly.
 	Unfortunately, the resulting temacs still cannot dump.
 
-	* symbols.c (symbol_is_constant): 
-	(verify_ok_for_buffer_local): 
+	* symbols.c (symbol_is_constant):
+	(verify_ok_for_buffer_local):
 	-Wswitch Warning suppression - add default case to switches.
 
 	* redisplay.c (decode_mode_spec): Remove unused variables,
@@ -2117,7 +2197,7 @@
 1998-05-12  Didier Verna  <verna@inf.enst.fr>
 
 	* redisplay.c: removed the scrolling modeline code that didn't
-	make it for 21.0. To be continued ... 
+	make it for 21.0. To be continued ...
 
 1998-05-13  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>
 
@@ -2174,7 +2254,7 @@
 	(mswindows_output_vertical_divider): Always output the divider on
 	the right side of a window, down to bottom.
 
-	* keymap.c (get_relevant_keymaps): Route mouse button events which 
+	* keymap.c (get_relevant_keymaps): Route mouse button events which
 	happened over a window divider through window-divider-map.
 	(Fkey_binding): Documented that in the docstring.
 	Defined the variable Vwindow_divider_map.
@@ -2223,7 +2303,7 @@
 	(metrics); Changed parameters order and added DEFAULT parameter;
 	Unabbreviated some metric constants; Fixed and untabified doc string.
 	(Fdevice_system_metrics): Added. Returns a plist of all provided
-	metrics. 
+	metrics.
 
 	* device-msw.c (mswindows_device_system_metrics): Renamed
 	device_metrics enum constants.