CVS update by didierv xemacs/src ...

xemacs-cvs at xemacs.org xemacs-cvs at xemacs.org
Wed Sep 26 05:36:54 EDT 2007


  User: didierv 
  Date: 07/09/26 11:36:54

  Modified:    xemacs/src ChangeLog gutter.c
Log:
Don't assume DEFAULT_INDEX will always be 0

Revision  Changes    Path
1.1095    +1623 -1618XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1094
retrieving revision 1.1095
diff -u -p -r1.1094 -r1.1095
--- ChangeLog	2007/09/04 21:20:18	1.1094
+++ ChangeLog	2007/09/26 09:36:49	1.1095
@@ -1,15 +1,20 @@
+2007-09-26  Didier Verna  <didier at xemacs.org>
+
+	* gutter.c (calculate_gutter_size): Don't hardwire face index to
+	0: use DEFAULT_INDEX instead.
+
 2006-11-26  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* eval.c (Fcommand_execute):
 	* eval.c (Feval):
 	* eval.c (Ffuncall):
 	Use the PROFILE_DECLARE macro instead of declaring `struct
-	backtrace backtrace' by hand. 
+	backtrace backtrace' by hand.
 	* profile.h:
 	* profile.h (PROFILE_EXIT_FUNCTION):
 	* profile.h (PROFILE_ENTER_FUNCTION):
 	Check do_backtrace before passing the backtrace structure to
-	profile_record_about_to_call, profile_record_just_called. 
+	profile_record_about_to_call, profile_record_just_called.
 
 2007-08-28  Aidan Kehoe  <kehoea at parhasard.net>
 
@@ -43,10 +48,10 @@
 
 	* mule-ccl.c (ccl_driver):
 	Don't pass XCHAR_OR_INT an argument of which the evaluation has
-	side effects; thank you Mike Fabian. 
-	* lisp.h: 
-	Redundantly, don't multiply evaluate the argument to XCHAR_OR_INT; 
-	this should prevent the same error in the future. 
+	side effects; thank you Mike Fabian.
+	* lisp.h:
+	Redundantly, don't multiply evaluate the argument to XCHAR_OR_INT;
+	this should prevent the same error in the future.
 
 2007-08-17  Marcus Crestani  <crestani at xemacs.org>
 
@@ -55,7 +60,7 @@
 	* mc-alloc.c (set_bit):
 	* mc-alloc.c (init_mc_allocator): Use EMACS_UINT with bit
 	shifting.
-	
+
 2007-08-15  Marcus Crestani  <crestani at xemacs.org>
 
 	* database.c (dbm_map): Add typecast.
@@ -129,7 +134,7 @@
 	From Sebastian Freundt's mail
 	nhtfy9sitjf.fsf at muck.math.tu-berlin.de , Tue Jan 30 12:30:07 UTC
 	2007; complements 18005.16378.980760.860724 at parhasard.net .
-	
+
 	This reverts the error message when M-: (no-such-function t) RET
 	is called to the old "Symbol's function definition is void: ..."
 	rather than the recent "Invalid function: #<INTERNAL OBJECT ..."
@@ -145,12 +150,12 @@
 
 	* charset.h:
 	* charset.h (enum unicode_type):
-	Add UNICODE_UTF_32. 
+	Add UNICODE_UTF_32.
 	* lisp.h:
 	Add Qutf_32.
 	* lread.c (read_unicode_escape):
-	Error on an invalid Unicode escape; error on no mapping, as GNU does. 
-	
+	Error on an invalid Unicode escape; error on no mapping, as GNU does.
+
 	* mule-coding.c:
 	* mule-coding.c (dynarr_add_2022_one_dimension):
 	* mule-coding.c (dynarr_add_2022_two_dimensions):
@@ -180,26 +185,26 @@
 	since we decode Unicode error sequences to "Unicode" code points
 	starting at 0x200000, and will need to save them as such in
 	escape-quoted. Do not accept over-long UTF-8 sequences or UTF-16
-	surrogates in escape-quoted. 
+	surrogates in escape-quoted.
 
 	This change means that when a non-UTF-8 file is opened as UTF-8,
 	one change made, and immediately saved, the non-ASCII characters
-	are not corrupted. In Europe, this is a distinct win. 
+	are not corrupted. In Europe, this is a distinct win.
 
-	Add UCS-4, UTF-32 as coding systems. 
+	Add UCS-4, UTF-32 as coding systems.
 
 2007-07-26  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* mule-ccl.c (ccl_driver):
 	op is an integer, not a Lisp_Object; don't use it to temporarily
 	store a Lisp_Object. This change fixes the union build; thank you
-	for the report, Robert Delius Royar. 
+	for the report, Robert Delius Royar.
 
 2007-07-23  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* text.c:
 	Backslash a parenthesis at the start of a line, for the sake of
-	our font lock engine. 
+	our font lock engine.
 
 2007-07-21  Aidan Kehoe  <kehoea at parhasard.net>
 
@@ -215,14 +220,14 @@
 
 	* file-coding.c:
 	Add a backslash at the beginning of a line starting with a
-	parenthesis, for the sake of our font lock engine. 
-	
+	parenthesis, for the sake of our font lock engine.
+
 	* mule-ccl.c:
 	* mule-ccl.c (CCL_LookupIntConstTbl):
 	* mule-ccl.c (CCL_WRITE_STRING):
 	* mule-ccl.c (POSSIBLE_LEADING_BYTE_P):
 	Fix a bug where the charset ID of ASCII was not recognised as
-	being a possible leading byte. 
+	being a possible leading byte.
 	* mule-ccl.c (CCL_MAKE_CHAR):
 	Take Mule character arguments in the same format as GNU.
 	* mule-ccl.c (CCL_DEBUG):
@@ -240,20 +245,20 @@
 	places; with XEmacs (and even with GNU Emacs), where the
 	character-integer map is not constant from one invocation to the
 	next, it makes sense for CCL programs with character literals to
-	accept those literals as characters, not integers. 
+	accept those literals as characters, not integers.
 
 	If we're a debug build, allow access to ccl-program-table from
-	Lisp, which can make debugging things easier. 
+	Lisp, which can make debugging things easier.
 
 	Take out font-ccl-encoder-alist, since it was never implemented,
 	and was not ever a stellar idea.
 
-	Provide translation-hash-table-vector, as in GNU. 
+	Provide translation-hash-table-vector, as in GNU.
 
 2007-06-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* event-unixoid.c (event_stream_unixoid_create_io_streams):
-	* process-unix.c (unix_init_process_io_handles): 
+	* process-unix.c (unix_init_process_io_handles):
 	Cast out bogus warnings about 64-bit value truncation.
 
 2007-06-23  Stephen J. Turnbull  <stephen at xemacs.org>
@@ -284,7 +289,7 @@
 	Small optimisations from Sebastian Freundt's SXEmacs work; don't
 	do the unnecessary book-keeping in the trivial cases, only look
 	for an indirect function if the stored function is a bound
-	symbol. 
+	symbol.
 
 2007-05-24  Aidan Kehoe  <kehoea at parhasard.net>
 
@@ -293,7 +298,7 @@
 	* lisp.h (xfree):
 	Inspired by some of Sebastian Freundt's SXEmacs work, use a 64-bit
 	constant on 64-bit platforms when making sure pointers haven't
-	been freed twice. 
+	been freed twice.
 
 2007-05-22  Ville Skyttä  <scop at xemacs.org>
 
@@ -310,7 +315,7 @@
 	* abbrev.c (write_abbrev): Losely ported from GNU Emacs.
 	* abbrev.c (describe_abbrev): Ditto.
 	* abbrev.c (Finsert_abbrev_table_description): Ditto.
-	
+
 2007-05-03  Vin Shelton  <acs at xemacs.org>
 
 	* dumper.c (pdump): Don't close an already-closed file
@@ -330,19 +335,19 @@
 	* unicode.c:
 	* unicode.c (encode_unicode_char_1):
 	* unicode.c (unicode_convert):
-	Support non-BMP characters in UTF-16. 
+	Support non-BMP characters in UTF-16.
 
 2007-05-12  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* event-Xt.c (x_reset_modifier_mapping):
 	* event-gtk.c (gtk_reset_modifier_mapping):
 	Zero out the device's modifier map once we've freed it, to prevent
-	a double free on a re-entrant call. 
+	a double free on a re-entrant call.
 
 2007-05-01  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* font-mgr.c (Qfontsetp): Remove unused declaration.
-	
+
 	* font-mgr.c (xft-version): Make it a DEFVAR_CONST_INT.
 
 	* font-mgr.c (fc-version): New: fontconfig.h version.
@@ -354,7 +359,7 @@
 	* faces.c (complex_vars_of_faces):
 	New symbol and corresponding specifier tag,
 	x-coverage-instantiator, used to group those fonts used for their
-	extensive coverage for obscure characters in x-faces.el. 
+	extensive coverage for obscure characters in x-faces.el.
 
 2007-04-16  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -404,7 +409,7 @@
 	* font-mgr.c (Ffc_init):
 	* font-mgr.c (Ffc_init_reinitialize):
 	Implemented operations.
-	
+
 	* font-mgr.c (Ffc_config_destroy):
 	* font-mgr.c (Ffc_config_get_blanks):
 	Stub operations.
@@ -512,13 +517,13 @@
 	* specifier.c (setup_device_initial_specifier_tags):
 	Fix a bug where the mswindows specifier tag was matching X11
 	devices, because the format of the DEVICE_USER_SPECIFIED_TAGS list
-	wasn't being respected correctly. 
+	wasn't being respected correctly.
 
 2007-02-06  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* mule-charset.c (complex_vars_of_mule_charset):
 	iso8859-2 is not the X11 charset registry for the iso8859-4
-	charset, my mistake. 
+	charset, my mistake.
 
 2007-02-05  Mike Sperber  <mike at xemacs.org>
 
@@ -534,10 +539,10 @@
 
 	* eval.c:
 	Document in more detail what happens with byte-compilation,
-	`function', and `quote'. 
+	`function', and `quote'.
 	* fns.c:
 	Mention that `require' is evaluated both at byte-compile time and
-	at runtime. 
+	at runtime.
 
 2007-01-06  Vin Shelton  <acs at xemacs.org>
 
@@ -549,19 +554,19 @@
 	Update the make-coding-system docstring to reflect unicode-type
 	* general-slots.h:
 	New symbol, unicode-type, since 'type was being overridden when
-	accessing a coding system's Unicode subtype. 
+	accessing a coding system's Unicode subtype.
 	* intl-win32.c:
-	Backslash a few parentheses, to help fontification along. 
+	Backslash a few parentheses, to help fontification along.
 	* intl-win32.c (complex_vars_of_intl_win32):
 	Use the 'unicode-type symbol, not 'type, when creating the
-	Microsoft Unicode coding system. 
+	Microsoft Unicode coding system.
 	* unicode.c (unicode_putprop):
 	* unicode.c (unicode_getprop):
 	* unicode.c (unicode_print):
 	Using 'type as the property name when working out what Unicode
 	subtype a given coding system is was broken, since there's a
 	general coding system property called 'type. Change the former to
-	use 'unicode-type instead. 
+	use 'unicode-type instead.
 
 2006-12-27  Malcolm Purvis  <malcolmp at xemacs.org>
 
@@ -571,38 +576,38 @@
 2006-12-17  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* faces.c (complex_vars_of_faces):
-	Don't use server-side fallbacks when building with XFT support. 
+	Don't use server-side fallbacks when building with XFT support.
 
 2006-12-06  Dr. Volker Zell  <Dr.Volker.Zell at oracle.com>
 
 	* config.h.in: New HAVE_U_INT*_T defines.
 	* database.c: Only use u_int*_t typedefs if not already
 	defined.
+
+2006-12-08  Aidan Kehoe  <kehoea at parhasard.net>
 
-2006-12-08  Aidan Kehoe  <kehoea at parhasard.net> 
- 
-	* specifier.c (charset_matches_specifier_tag_set_p): 
-	A charset's entry in Vcharset_tag_lists may be nil, if, when that 
-	charset was created, no tags with associated charset predicates 
-	existed. Accept this possibility, treat it as the tag not matching 
-	that charset.  
+	* specifier.c (charset_matches_specifier_tag_set_p):
+	A charset's entry in Vcharset_tag_lists may be nil, if, when that
+	charset was created, no tags with associated charset predicates
+	existed. Accept this possibility, treat it as the tag not matching
+	that charset.
 
 2006-12-11  Aidan Kehoe  <kehoea at parhasard.net>
 
-	* event-tty.c: 
-	* event-tty.c (emacs_tty_event_pending_p): 
-	* event-tty.c (reinit_vars_of_event_tty): 
-	Pay attention to the dispatch event queue, and input pending 
-	signals in emacs_tty_event_pending_p. Makes pure TTY builds more 
-	responsive.  
+	* event-tty.c:
+	* event-tty.c (emacs_tty_event_pending_p):
+	* event-tty.c (reinit_vars_of_event_tty):
+	Pay attention to the dispatch event queue, and input pending
+	signals in emacs_tty_event_pending_p. Makes pure TTY builds more
+	responsive.
 
 2006-12-11  Aidan Kehoe  <kehoea at parhasard.net>
 
-	* glyphs-eimage.c (png_warning_func): 
-	* glyphs-eimage.c (png_instantiate): 
-	* glyphs-eimage.c (tiff_warning_func): 
-	Decode external binary data as such before passing it to 
-	warn_when_safe().  
+	* glyphs-eimage.c (png_warning_func):
+	* glyphs-eimage.c (png_instantiate):
+	* glyphs-eimage.c (tiff_warning_func):
+	Decode external binary data as such before passing it to
+	warn_when_safe().
 
 2006-12-09  Vin Shelton  <acs at xemacs.org>
 
@@ -628,7 +633,7 @@
 
 	* text.c (Fsplit_char):
 	Make split-char available on non-Mule builds, taking out a
-	superfluous call to get-charset to make that possible. 
+	superfluous call to get-charset to make that possible.
 
 2006-11-30  Mike Sperber  <mike at xemacs.org>
 
@@ -647,14 +652,14 @@
 	Add an optional argument FORCE, to allow specifying badly-formed
 	CHARSET_REGISTRY-CHARSET_ENCODING combinations. Re-enables the
 	sort of hacks described in 96wt67fa3f.fsf at mo.msk.ru from Ilya
-	Golubev. 
+	Golubev.
 
 2006-11-29  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* sound.c (init_native_sound):
 	Only X11 and GTK devices can possibly not be on the console of the
 	associated machine. Fixes a crash when init_native_sound is called
-	on a msprinter device. 
+	on a msprinter device.
 
 2006-11-28  Aidan Kehoe  <kehoea at parhasard.net>
 
@@ -662,23 +667,23 @@
 	* device-x.c (coding_system_of_xrm_database):
 	Cache the last db argument and resulting coding system, and return
 	them--instead of calling Lisp--if the DB is the same pointer
-	arument as last time. 
+	arument as last time.
 	* faces.c (default_face_font_info):
 	* window.c (window_displayed_height):
 	Behave more gracefully if called when we have no information about
-	the dimensions of the default face and window. 
+	the dimensions of the default face and window.
 
 2006-11-28  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* doprnt.c (emacs_doprnt_1):
-	Ibyte -> Ascbyte, for the sake of the MSVC build. Thank you Vin. 
+	Ibyte -> Ascbyte, for the sake of the MSVC build. Thank you Vin.
 
 2006-11-28  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* doprnt.c (emacs_doprnt_1):
 	Integrate Sebastian Freundt's SXEmacs bug fix for cases where a
 	format specifier overflows the allocated buffer with a float
-	format string. 
+	format string.
 
 2006-11-23  Robert Pluim  <rpluim at gmail.com>
 
@@ -689,7 +694,7 @@
 
 	* mule-coding.c (iso2022_decode):
 	Only take the lower seven bits of any eight-bit character that
-	would be illegal in UTF-8, when handling ISO/IR 196 escapes. 
+	would be illegal in UTF-8, when handling ISO/IR 196 escapes.
 
 2006-11-14  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -721,34 +726,34 @@
 
 	* mule-charset.c:
 	* mule-charset.c (Fcharsets_in_region):
-	Added a charsets-in-region implementation in C. 
+	Added a charsets-in-region implementation in C.
 
 2006-11-14  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* objects-xlike-inc.c (x_find_charset_font):
 	Move the warn_when_safe call to where GCing is irrelevant; as
 	things are it doesn't GC, but I'm more comfortable without that
-	being relevant. 
+	being relevant.
 	* specifier.c (define_specifier_tag):
 	Remove a couple of lines added for the sake of debugging; add a
 	GCPRO1 for the allocated vector, since the call_trapping_problems
-	can GC. 
+	can GC.
 
 2006-11-12  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* charset.h:
 	* mule-charset.c (set_charset_registries):
 	Provide a C-accessible version of set-charset-registries that
-	doesn't error. Called from x_find_charset_font. 
+	doesn't error. Called from x_find_charset_font.
 
 	* faces.c (ensure_face_cachel_contains_charset):
-	Correct my spelling. 
-	
+	Correct my spelling.
+
 	* faces.c (update_EmacsFrame):
-	Don't update the frame if it isn't live. 
-	
+	Don't update the frame if it isn't live.
+
 	* faces.h:
-	Add some documentation on FACE_FONT. 
+	Add some documentation on FACE_FONT.
 
 	* frame-gtk.c (gtk_update_frame_external_traits):
 	* frame-x.c (x_update_frame_external_traits):
@@ -760,7 +765,7 @@
 	* mule-charset.c (Fset_charset_registries):
 	Don't allow XLFD wildcards in charset registries. Call the
 	factored-out C-callable version instead of implementing the guts
-	of the function here. 
+	of the function here.
 
 	* objects-gtk.c:
 	#include "charset.h"
@@ -769,17 +774,17 @@
 	gtk_find_charset_font): In the event that the charset is ASCII and
 	we haven't matched anything up to now, even with a pattern of "*",
 	add "iso8859-1" to the charset's registry and try again.
-	
+
 	* window.c (window_pixel_width_to_char_width):
 	The default width of a face may be zero; only divide by it if it's
-	nonzero. 
-	
+	nonzero.
+
 2006-11-11  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* specifier.c:
 	Update the specifier-matching-instance documentation to reflect
-	the new format of font-specifier MATCHSPECs. 
-	
+	the new format of font-specifier MATCHSPECs.
+
 2006-11-11  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* specifier.c:
@@ -791,154 +796,154 @@
 
 	* specifier.c (specifier_instance_from_inst_list):
 	Accept symbols as well as charset objects as the cons of a
-	font-related specifier matchspec. Thank you Ilya. 
-	
+	font-related specifier matchspec. Thank you Ilya.
+
 2006-11-07  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* mule-charset.c:
 	Take the Qfinal declaration out of mule-charset.c; fixes the MSVC
 	build. Sorry Vin!
-	
+
 2006-11-06  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* mule-charset.c (Fmake_charset):
 	* objects-msw.c (mswindows_font_spec_matches_charset):
 	* specifier.c (syms_of_specifier):
 	Three changes to prevent the build dying with MSVC and with
-	DEBUG_XEMACS turned off--thank you Vin. 
-	
+	DEBUG_XEMACS turned off--thank you Vin.
+
 2006-11-05  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* charset.h:
+	Prefer the charset-registries property to the charset-registry
+	property; accept the latter for compatibility, warning when its
+	regexp functionality is used.
+
+	* charset.h (XCHARSET_CCL_PROGRAM):
+	* charset.h (XCHARSET_NAME):
+	Make dummy versions of these available in non-Mule.
+
+	* console-impl.h:
+	* console-impl.h (struct console_methods):
+	Rename the last parameter to a couple of methods; reformat their
+	declarations.
 
-	* charset.h: 
-	Prefer the charset-registries property to the charset-registry 
-	property; accept the latter for compatibility, warning when its 
-	regexp functionality is used.  
-	 
-	* charset.h (XCHARSET_CCL_PROGRAM): 
-	* charset.h (XCHARSET_NAME): 
-	Make dummy versions of these available in non-Mule. 
- 
-	* console-impl.h: 
-	* console-impl.h (struct console_methods): 
-	Rename the last parameter to a couple of methods; reformat their 
-	declarations.  
-	 
-	* faces.c: 
-	* faces.c (face_property_matching_instance): 
-	* faces.c (ensure_face_cachel_contains_charset): 
-	* faces.c (merge_face_cachel_data): 
-	* faces.c (reset_face_cachel): 
-	* faces.c (mark_face_cachels_as_not_updated): 
-	* faces.c (syms_of_faces): 
-	* faces.c (vars_of_faces): 
-	* faces.c (complex_vars_of_faces): 
-	Provide a DEBUG_FACES macro; use it to make debugging output 
-	available in debug builds. 
-	Implement multi-stage font lookup, assigning the stages names, not 
-	numbers. 
-	Re-implement the cachel->font_specified cache using the 
-	infrastructure for Lisp bit vectors.  
-	 
-	* faces.h: 
-	* faces.h (struct face_cachel): 
-	* faces.h (FACE_CACHEL_FONT_UPDATED): 
-	* faces.h (FACE_FONT): 
-	Re-implement the cachel->font_specified cache using the 
-	infrastructure for Lisp bit vectors.  
- 
-	* font-mgr.h: 
-	Move some XFT debug macros here from objects-x.c.  
- 
-	* general-slots.h: 
-	Provide a few new symbols for the multi-stage font resolution 
-	process.  
-
-	* intl.c (init_intl): 
-	Correct a comment.  
-	 
-	* lisp.h: 
-	Provide a macro to declare an inline lisp bit vector where the 
-	size is fixed. 
-	Make Qregistries available all over, not Qregistry.  
-	 
-	* mule-charset.c: 
-	* mule-charset.c (mark_charset): 
-	* mule-charset.c (print_charset): 
-	* mule-charset.c (make_charset): 
-	* mule-charset.c (Fmake_charset): 
-	* mule-charset.c (Fcharset_property): 
-	* mule-charset.c (Fset_charset_ccl_program): 
-	* mule-charset.c (syms_of_mule_charset): 
-	* mule-charset.c (complex_vars_of_mule_charset): 
-	* mule-charset.c (CHINESE_CNS_PLANE): 
-	Prefer the charset-registries property to the charset-registry 
-	property; accept the latter for compatibility, warning when its 
-	regexp functionality is used.  
- 
-	* objects-gtk.c: 
-	* objects-gtk.c (gtk_font_spec_matches_charset): 
-	* objects-gtk.c (gtk_find_charset_font): 
-	* objects-msw.c (mswindows_find_charset_font): 
-	* objects-tty.c (tty_find_charset_font): 
-	Redeclare various functions to work with the multi-stage lookup 
+	* faces.c:
+	* faces.c (face_property_matching_instance):
+	* faces.c (ensure_face_cachel_contains_charset):
+	* faces.c (merge_face_cachel_data):
+	* faces.c (reset_face_cachel):
+	* faces.c (mark_face_cachels_as_not_updated):
+	* faces.c (syms_of_faces):
+	* faces.c (vars_of_faces):
+	* faces.c (complex_vars_of_faces):
+	Provide a DEBUG_FACES macro; use it to make debugging output
+	available in debug builds.
+	Implement multi-stage font lookup, assigning the stages names, not
+	numbers.
+	Re-implement the cachel->font_specified cache using the
+	infrastructure for Lisp bit vectors.
+
+	* faces.h:
+	* faces.h (struct face_cachel):
+	* faces.h (FACE_CACHEL_FONT_UPDATED):
+	* faces.h (FACE_FONT):
+	Re-implement the cachel->font_specified cache using the
+	infrastructure for Lisp bit vectors.
+
+	* font-mgr.h:
+	Move some XFT debug macros here from objects-x.c.
+
+	* general-slots.h:
+	Provide a few new symbols for the multi-stage font resolution
+	process.
+
+	* intl.c (init_intl):
+	Correct a comment.
+
+	* lisp.h:
+	Provide a macro to declare an inline lisp bit vector where the
+	size is fixed.
+	Make Qregistries available all over, not Qregistry.
+
+	* mule-charset.c:
+	* mule-charset.c (mark_charset):
+	* mule-charset.c (print_charset):
+	* mule-charset.c (make_charset):
+	* mule-charset.c (Fmake_charset):
+	* mule-charset.c (Fcharset_property):
+	* mule-charset.c (Fset_charset_ccl_program):
+	* mule-charset.c (syms_of_mule_charset):
+	* mule-charset.c (complex_vars_of_mule_charset):
+	* mule-charset.c (CHINESE_CNS_PLANE):
+	Prefer the charset-registries property to the charset-registry
+	property; accept the latter for compatibility, warning when its
+	regexp functionality is used.
+
+	* objects-gtk.c:
+	* objects-gtk.c (gtk_font_spec_matches_charset):
+	* objects-gtk.c (gtk_find_charset_font):
+	* objects-msw.c (mswindows_find_charset_font):
+	* objects-tty.c (tty_find_charset_font):
+	Redeclare various functions to work with the multi-stage lookup
 	process. Include objects-xlike-inc.
- 
-	* objects-x.c: 
-	Provide a DEBUG_OBJECTS macro; use it to make debugging output 
-	available in debug builds. 
-
-	* objects-x.c (x_initialize_font_instance): 
-	* objects-x.c (x_print_font_instance): 
-	* objects-x.c (xlistfonts_checking_charset): 
-	* objects-x.c (vars_of_objects_x): 
-	Don't regex match on the output of XListFonts; instead, use the 
-	fixed strings of the charset-registries to comparatively limit the 
+
+	* objects-x.c:
+	Provide a DEBUG_OBJECTS macro; use it to make debugging output
+	available in debug builds.
+
+	* objects-x.c (x_initialize_font_instance):
+	* objects-x.c (x_print_font_instance):
+	* objects-x.c (xlistfonts_checking_charset):
+	* objects-x.c (vars_of_objects_x):
+	Don't regex match on the output of XListFonts; instead, use the
+	fixed strings of the charset-registries to comparatively limit the
 	IPC that will happen.  Include objects-xlike-inc.c
-	 
+
 	* objects-xlike-inc.c:
 	* objects-xlike-inc.c (count_hyphens):
-	New. How many ASCII minus characters in a string?  
+	New. How many ASCII minus characters in a string?
 
 	* objects-xlike-inc.c (xlistfonts_checking_charset):
 	* objects-xlike-inc.c (mule_to_fc_charset):
 	* objects-xlike-inc.c (xft_find_charset_font):
-	* objects-x.c (x_find_charset_font): 
-	Move some methods here to share them with GTK. 
+	* objects-x.c (x_find_charset_font):
+	Move some methods here to share them with GTK.
+
+	* objects.c (print_font_instance):
+	* objects.c (font_spec_matches_charset):
+	* objects.c (font_validate_matchspec):
+	* objects.c (font_instantiate):
+	Redeclare some methods to take enums rather than numeric stages.
+
+	* objects.h (EXFUN):
+	Make Fregexp_quote available to mule-charset.c
+
+	* redisplay-x.c:
+	* redisplay-x.c (separate_textual_runs):
+	Make this slightly faster, cleaner. Make it accept a face cachel
+	pointer argument, and check it as to whether a given charset
+	should be translated to UCS-2 before redisplay.
+
+	* specifier.c:
+	* specifier.c (charset_matches_specifier_tag_set_p):
+	* specifier.c (define_specifier_tag):
+	* specifier.c (Fdefine_specifier_tag):
+	* specifier.c (setup_device_initial_specifier_tags):
+	* specifier.c (setup_charset_initial_specifier_tags):
+	* specifier.c (specifier_instance_from_inst_list):
+	* specifier.c (syms_of_specifier):
+	* specifier.c (vars_of_specifier):
+	* specifier.h:
+	Extend specifiers to allow limiting their applicability by using
+	charset predicates. Document this.
+	Run indent-region on the file, at Stephen's suggestion.
 
-	* objects.c (print_font_instance): 
-	* objects.c (font_spec_matches_charset): 
-	* objects.c (font_validate_matchspec): 
-	* objects.c (font_instantiate): 
-	Redeclare some methods to take enums rather than numeric stages.  
- 
-	* objects.h (EXFUN): 
-	Make Fregexp_quote available to mule-charset.c 
-	 
-	* redisplay-x.c: 
-	* redisplay-x.c (separate_textual_runs): 
-	Make this slightly faster, cleaner. Make it accept a face cachel 
-	pointer argument, and check it as to whether a given charset 
-	should be translated to UCS-2 before redisplay.  
-	 
-	* specifier.c: 
-	* specifier.c (charset_matches_specifier_tag_set_p): 
-	* specifier.c (define_specifier_tag): 
-	* specifier.c (Fdefine_specifier_tag): 
-	* specifier.c (setup_device_initial_specifier_tags): 
-	* specifier.c (setup_charset_initial_specifier_tags): 
-	* specifier.c (specifier_instance_from_inst_list): 
-	* specifier.c (syms_of_specifier): 
-	* specifier.c (vars_of_specifier): 
-	* specifier.h: 
-	Extend specifiers to allow limiting their applicability by using 
-	charset predicates. Document this.  
-	Run indent-region on the file, at Stephen's suggestion. 
-	
-	* unicode.c (unicode_to_ichar): 
-	* unicode.c (syms_of_unicode): 
-	* unicode.c (vars_of_unicode): 
-	Use unicode-registries, a dumped vector, as the charset-registries 
-	of the on-the-fly JIT charsets.  
+	* unicode.c (unicode_to_ichar):
+	* unicode.c (syms_of_unicode):
+	* unicode.c (vars_of_unicode):
+	Use unicode-registries, a dumped vector, as the charset-registries
+	of the on-the-fly JIT charsets.
 
 2006-11-01  Adrian Aichner  <adrian at xemacs.org>
 
@@ -964,13 +969,13 @@
 	* event-xlike-inc.c:
 	Rework the X11 keysym support to allow the use of Cyrillic keysyms
 	that are not in ISO-8859-5.
-	
+
 2006-10-27  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* fileio.c (Finsert_file_contents_internal) : Clarify that we
 	follow a more correct but more expensive design for buffers where
 	the on-disk representation doesn't correspond directly to the
-	XEmacs internal representation. 
+	XEmacs internal representation.
 
 2006-08-29  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -988,14 +993,14 @@
 	New flag; multiple_width, specifying whether East Asian characters
 	take up two columns on this terminal. The macro to access it
 	expands to a constant under non-Mule, so anything conditionalising
-	on it will be optimised away. 
+	on it will be optimised away.
 
 	* console-tty.c:
 	* console-tty.c (tty_init_console):
 	Initialise tty_con->multiple_width; zero on non-Mule, one on Mule.
 
 	* console-tty.c (Fconsole_tty_multiple_width): New.
-	* console-tty.c (Fset_console_tty_multiple_width): New. 
+	* console-tty.c (Fset_console_tty_multiple_width): New.
 	* console-tty.c (syms_of_console_tty): Make them available outside
 	console-tty.c.
 
@@ -1003,19 +1008,19 @@
 	* redisplay-tty.c (tty_output_ibyte_string):
 	Check that the relevant console has multiple-width characters
 	before using something other than the number of characters in a
-	string for the text width of that string. 
+	string for the text width of that string.
 
 	* text.c:
 	* text.c (ibyte_string_displayed_columns):
 	* text.c (ichar_string_displayed_columns):
-	Remove some Mule conditionals; add some sanity-checking. 
-	
+	Remove some Mule conditionals; add some sanity-checking.
+
 2006-08-23  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* syntax.c (complex_vars_of_syntax):
 	Guillemets are now punctuation, not parentheses. AucTeX does this,
 	and it's infinitely less annoying if you're dealing with German
-	text or mixed German and French. 
+	text or mixed German and French.
 
 2006-08-03  Jerry James  <james at xemacs.org>
 
@@ -1027,26 +1032,26 @@
 	* doc.c (Fsnarf_documentation):
 	Add an assertion and a comment, rather than crashing in the
 	76584th call of hash_string when someone's using a DOC file that
-	doesn't conform to format. 
-	
+	doesn't conform to format.
+
 2006-08-05  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* syntax.c (complex_vars_of_syntax):
 	String literals are char[], not unsigned char[]. Cast them when
-	passing to a function that takes UExtbyte *. 
-	
+	passing to a function that takes UExtbyte *.
+
 2006-08-05  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* lread.c (read_unicode_escape):
 	Refactor this code out from read_escape, since it's now called
-	from read_string as well. 
+	from read_string as well.
 	* lread.c (read_escape):
-	Call read_unicode_escape instead of using inline code, 
+	Call read_unicode_escape instead of using inline code,
 	* lread.c (read_string):
-	Refactor out from read1, provide raw and honor_unicode options. 
+	Refactor out from read1, provide raw and honor_unicode options.
 	* lread.c (read_raw_string):
 	Added, a function that calls read_string with the correct
-	arguments for a raw string. 
+	arguments for a raw string.
 	* lread.c (read1):
 	Pass raw strings to read_raw_string; pass strings to read_string.
 
@@ -1060,7 +1065,7 @@
 2006-08-04  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* syntax.c (Fsyntax_table_p):
-	Make the docstring better reflect the code. 
+	Make the docstring better reflect the code.
 	* syntax.c (define_standard_syntax):
 	Take a const UExtbyte * as the first argument, not a const char *
 
@@ -1095,7 +1100,7 @@
 	* redisplay.c (add_octal_runes):
 	* syntax.h:
 	* text.c
-	Change some comments to reflect a 21-bit character space. 
+	Change some comments to reflect a 21-bit character space.
 	* text.c (non_ascii_valid_ichar_p):
 	Check that no character value is greater than 2^^21, not
 	2^^19. This fixes the Mule build when error-checking is turned on.
@@ -1207,8 +1212,8 @@
 	* event-xlike-inc.c:
 	Add support for three publishing keysyms with clear Unicode
 	mappings. They would have been included in my commit of 2005-06-26
-	had Markus Kuhn known about them. 
-	
+	had Markus Kuhn known about them.
+
 2006-06-13  Jerry James  <james at xemacs.org>
 
 	* lisp-union.h: Cast away bit restrictions on values retrieved
@@ -1218,11 +1223,11 @@
 
 	* mule-ccl.c:
 	Don't declare ccl-program as a symbol here, leave that to
-	general-slots.h. 
+	general-slots.h.
 	* unicode.c (unicode_to_ichar):
 	Use qxesprintf, not snprintf, change some types to allow
-	complilation on Win32. 
-	
+	complilation on Win32.
+
 2006-06-03  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* charset.h:
@@ -1237,78 +1242,78 @@
 
 	Make enum unicode_type, encode_unicode_char and Funicode_to_char
 	available outside of unicode.c
-	
+
 	* lread.c:
 	* event-xlike-inc.c:
 	Use the charset.h declaration of Funicode_to_char, don't declare
-	it ourselves. 
+	it ourselves.
 
 	My XFree86 installation has taken to passing me ASCII characters
-	using the Unicode keysyms; accept them too. 
-	
+	using the Unicode keysyms; accept them too.
+
 	* general-slots.h:
 	Make `ccl-program' and `encode-as-utf-8' available as symbols
-	generally. 
+	generally.
 
 	* mule-ccl.c:
 	Add CCL_MuleToUnicode, CCL_UnicodeToMule, implement them, enable
 	and debug CCL_MAKE_CHAR, have CCL_WriteMultibyteChar2 segfault
-	less, fix some grammar. 
+	less, fix some grammar.
 
 	* mule-charset.c (make_charset):
 	* mule-charset.c (Fmake_charset):
 	* mule-charset.c (Fcharset_property):
 	* mule-charset.c (complex_vars_of_mule_charset):
 	Require the encode_as_utf_8 property when calling make_charset ();
-	accept it when creating a charset from Lisp in Fmake_charset. 
+	accept it when creating a charset from Lisp in Fmake_charset.
 
 	* mule-coding.c:
 	* mule-coding.c (dynarr_add_2022_one_dimension):
 	* mule-coding.c (dynarr_add_2022_two_dimensions):
 	Add two convenience functions for iso2022_decode, to abstract out
-	writing UTF-8 a little. 
-	
+	writing UTF-8 a little.
+
 	* mule-coding.c (enum iso_esc_flag):
-	Add one more state to reflect the existence of the UTF-8 escape. 
+	Add one more state to reflect the existence of the UTF-8 escape.
 
 	* mule-coding.c (struct iso2022_coding_stream):
 	Add a counter variable to the state to permit handling
-	variable-length UTF-8. 
-	
+	variable-length UTF-8.
+
 	* mule-coding.c (parse_iso2022_esc):
 	Update the function to work with ISO_STATE_UTF_8; only the ESC % @
 	escape is processed in that state, everything else is ignored and
-	passed through by the error handler. 
-	
+	passed through by the error handler.
+
 	* mule-coding.c (iso2022_decode):
 	* mule-coding.c (iso2022_designate):
 	* mule-coding.c (iso2022_encode):
 	Handle the UTF-8 escape sequences in reading and in writing ISO
-	2022. 
-	
+	2022.
+
 	* redisplay-x.c (separate_textual_runs):
 	Add a comment to the effect that the dimension stuff breaks when
-	using CCL programs and registries to map to a bigger charset. 
-	
+	using CCL programs and registries to map to a bigger charset.
+
 	* unicode.c:
 	Add support for creating new characters on the fly as unknown
-	Unicode code points are encountered. 
+	Unicode code points are encountered.
 
 	* unicode.c (get_free_codepoint): New.
 	* unicode.c (unicode_to_ichar): Reworked to create new code points
-	on the fly. 
-	* unicode.c (Funicode_to_char): Update the docstring. 
+	on the fly.
+	* unicode.c (Funicode_to_char): Update the docstring.
 	* unicode.c (struct unicode_coding_system):
-	Move enum unicode_type into charset.h. 
+	Move enum unicode_type into charset.h.
 
 	* unicode.c (encode_unicode_char):
 	encode_unicode_char isn't static any longer, mule-coding.c uses
-	it. 
+	it.
 	* unicode.c (syms_of_unicode):
 	Make a couple of symbols available to unicode.c
 	* unicode.c (vars_of_unicode):
 	Tell the garbage collector about current_jit_charset, initialise
-	it. 
+	it.
 
 2006-05-25  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -1330,8 +1335,8 @@
 2006-05-23  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* file-coding.c (output_bytes_in_ascii_and_hex):
-	Fix a Win32 build failure introduced by my last commit. 
-	
+	Fix a Win32 build failure introduced by my last commit.
+
 2006-05-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* .gdbinit.in: Moved to etc.
@@ -1347,13 +1352,13 @@
 	* frame-x.c (x_set_frame_properties):
 	Check that the frame is live and that the device is not being
 	deleted before attempting anything.  Avoids calling X code if
-	x_IO_error_handler has seen a broken pipe. 
-	
+	x_IO_error_handler has seen a broken pipe.
+
 2006-05-22  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* file-coding.c (output_bytes_in_ascii_and_hex):
 	Pass stderr_out internally-formatted data, don't use an external
-	format. 
+	format.
 
 2006-05-21  Aidan Kehoe  <kehoea at parhasard.net>
 
@@ -1364,7 +1369,7 @@
 	ten years at least, but it was Fabrice Popineau's investigation of
 	the code on the same model in extract_object_file_name that
 	provoked its discovery.  Thank you Fabrice!
-	
+
 2006-05-16  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* XEmacs 21.5.27 "fiddleheads" is released.
@@ -1427,27 +1432,27 @@
 2006-05-06  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* lisp.h (struct Lisp_Subr):
-	Document that prompt, doc, and name should not be char *. 
+	Document that prompt, doc, and name should not be char *.
 	* symbols.c (Fsubr_name):
-	Cast name to const Ibyte * before returning it. 
+	Cast name to const Ibyte * before returning it.
 	* sysfile.h:
 	Make versions of DIRECTORY_SEP, IS_DIRECTORY_SEP and IS_ANY_SEP
-	available to make-docfile and other non-emacs processes on win32. 
-	
+	available to make-docfile and other non-emacs processes on win32.
+
 2006-04-30  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* font-mgr.c (string_list_to_fcobjectset): Remove debugging output.
 
 2006-04-29  Aidan Kehoe  <kehoea at parhasard.net>
 
-	* symbols.c (Fsubr_name): New. 
+	* symbols.c (Fsubr_name): New.
 	Taken from the FSF. Needed to find the real name of a possibly
 	aliased subr, in order to get its docstring.
 	* sysfile.h:
 	Make various file name primitives available to make-docfile and
 	other non-emacs environments; define a constant that says how long
-	a source filename can be in lib-src/DOC. 
-	
+	a source filename can be in lib-src/DOC.
+
 2006-04-29  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* doc.c:
@@ -1455,15 +1460,15 @@
 	* doc.c (get_object_file_name):
 	* doc.c (Fbuilt_in_symbol_file):
 	Support saving and recovering the source file name of a built-in
-	symbol (that is, one created in C.) 
-	
+	symbol (that is, one created in C.)
+
 2006-04-29  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* lread.c:
 	* lread.c (read_escape):
 	Support \uABCD and \U00ABCDEF for specifying characters by their
-	Unicode code point. 
-	
+	Unicode code point.
+
 2006-04-25  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	Repair busted commit, plus some gratuitous doc improvements.
@@ -1494,8 +1499,8 @@
 	* data.c (Flistp):
 	Take on board feedback from Stephen on my last change; move the
 	explanation of what a cons is to the cons docstring, add cross
-	references to that from the consp and atomp docstrings. 
-	
+	references to that from the consp and atomp docstrings.
+
 2006-04-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* Makefile.in.in (x_objs): Change xft-fonts.o to font-mgr.o.
@@ -1551,10 +1556,10 @@
 	Short docstring clarifications to make life easier for people who
 	are learning Lisp; explain what a cons is in the consp docstring,
 	what a symbol is in the symbolp docstring, and so forth. Thank you
-	Alan Mackenzie on emacs-devel. 
+	Alan Mackenzie on emacs-devel.
 	Expand on "monotonically increasing" and "monotonically
 	decreasing" in the Flss and Fgtr docstrings.
-	
+
 2006-04-10  Jerry James  <james at xemacs.org>
 
 	* alsaplay.c: Support pre-1.0.10 versions of the ALSA library.
@@ -1643,7 +1648,7 @@
 2006-03-20  Marcus Crestani  <crestani at xemacs.org>
 
 	* dynarr.c (Dynarr_realloc): Malloc correct size.
-	* lisp.h: Dynamic array cleanup, remove duplicate code. 
+	* lisp.h: Dynamic array cleanup, remove duplicate code.
 
 2006-03-17  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -1669,7 +1674,7 @@
 2006-02-22  Marcus Crestani  <crestani at xemacs.org>
 
 	Asynchronous finalization:
-	
+
 	* Makefile.in.in: Remove mc-alloc, replace with newgc.
 	* alloc.c (alloc_lrecord): Add object that has a finalizer
 	to Vall_finalizable_objs.
@@ -1685,7 +1690,7 @@
 	* gc.c (add_finalizable_object): New.
 	* gc.c (register_for_finalization): New.
 	* gc.c (gc_finalize): Call register_for_finalization.
-	* gc.c (gc_1): Move kkcc_gc_stack_free after finalization. 
+	* gc.c (gc_1): Move kkcc_gc_stack_free after finalization.
 	* gc.c (common_init_gc_early): Add asynchronous finalization
 	variables.
 	* gc.c (init_gc_early): Add asynchronous finalization variables.
@@ -1704,8 +1709,8 @@
 	* specifier.c (finalize_specifier): Remove unneeded finalizer for
 	NEW_GC.
 
-        Merge #ifdef MC_ALLOC into #ifdef NEW_GC, remove no longer needed
-	MC_ALLOC specific code in all files: 
+	Merge #ifdef MC_ALLOC into #ifdef NEW_GC, remove no longer needed
+	MC_ALLOC specific code in all files:
 	* alloc.c:
 	* buffer.c:
 	* bytecode.c:
@@ -1811,11 +1816,11 @@
 	* nt.c (init_mswindows_environment): Add EMACSEARLYPACKAGES,
 	EMACSLATEPACKAGES, EMACSLASTPACKAGES.
 
-	* config.h.in: 
+	* config.h.in:
 	(PATH_EARLY_PACKAGE_DIRECTORIES, PATH_LATE_PACKAGE_DIRECTORIES)
 	(PATH_LAST_PACKAGE_DIRECTORIES): Add.
 
-	* paths.h.in: 
+	* paths.h.in:
 	(PATH_EARLY_PACKAGE_DIRECTORIES, PATH_LATE_PACKAGE_DIRECTORIES)
 	(PATH_LAST_PACKAGE_DIRECTORIES): Add.
 
@@ -1831,37 +1836,37 @@
 	* alloc.c (MALLOC_BEGIN):
 	* alloc.c (FREE_OR_REALLOC_BEGIN):
 	Revert the alloc warning bugfix, in response to Stephen's mail
-	87acepzl6e.fsf at tleepslib.sk.tsukuba.ac.jp . 
+	87acepzl6e.fsf at tleepslib.sk.tsukuba.ac.jp .
 
 2005-12-24  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* objects-x.c (x_font_instance_truename):
 	* objects-x.c (x_find_charset_font):
 	Reintroduce my change of 2005-12-20 and Stephen's of 2005-12-23,
-	which my last commit overrode. 
-	
+	which my last commit overrode.
+
 2005-12-24  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* event-Xt.c:
- 	Add two new lisp variables, x-us-keymap-description and
+	Add two new lisp variables, x-us-keymap-description and
 	x-us-keymap-first-keycode to better provide a fallback to the US
 	layout with keyboards where typing the Roman alphabet and those
 	punctuation symbols that have command bindings associated with
 	them is difficult.
-	* event-Xt.c (x_event_to_emacs_event): 
- 	Use those two Lisp variables to improve Russian C-x processing.  
-	* event-stream.c (command_builder_find_leaf): 
- 	Make a comment more readable.  
+	* event-Xt.c (x_event_to_emacs_event):
+	Use those two Lisp variables to improve Russian C-x processing.
+	* event-stream.c (command_builder_find_leaf):
+	Make a comment more readable.
 
 2005-12-24  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* alloc.c (MALLOC_BEGIN):
 	Assert that we're either not in malloc, or warning about memory
-	being low. 
+	being low.
 	* alloc.c (MALLOC_WARNING_BEGIN, MALLOC_WARNING_END):
 	Add two clauses to set and clear a flag that we're in a low-memory
-	warning situation. 
-	* alloc.c (malloc_warning): 
+	warning situation.
+	* alloc.c (malloc_warning):
 	Move it after the definition of MALLOC_WARNING_BEGIN,
 	MALLOC_WARNING_END
 
@@ -1869,7 +1874,7 @@
 
 	* objects-gtk.c (MAX_FONT_COUNT):
 	* objects-x.c (MAX_FONT_COUNT): Increase MAX_FONT_COUNT from 5000
-	to INT_MAX. Applies to both the X and GTK platforms. 
+	to INT_MAX. Applies to both the X and GTK platforms.
 
 2005-12-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -1883,10 +1888,10 @@
 2005-12-20  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* objects-x.c (x_find_charset_font):
-	Return Qnil on no match, not Qunbound. Fixes performance issues 
-	based on the use of this return value in 
-	objects.c:font_instantiate  
-	
+	Return Qnil on no match, not Qunbound. Fixes performance issues
+	based on the use of this return value in
+	objects.c:font_instantiate
+
 2005-12-18  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* syntax.c (charset_syntax):
@@ -1894,9 +1899,9 @@
 	* syntax.c (complex_vars_of_syntax):
 	To my embarrassment, my previous change didn't actually work. This
 	change makes
-	    (char-syntax (make-char 'chinese-cns11643-1 50 50)) 
+	    (char-syntax (make-char 'chinese-cns11643-1 50 50))
 	give ?w, the expected result after the last change.
-	
+
 2005-12-18  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* XEmacs 21.5.24 "dandelion" is released.
@@ -1909,14 +1914,14 @@
 2005-12-18  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* chartab.c (Fmake_char_table):
-	Set the default character class to word, not whitespace. 
-	
+	Set the default character class to word, not whitespace.
+
 2005-12-17  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* buffer.c:
 	standard-syntax-table and standard-category-table are not
-	available from Lisp any more, don't mention as Lisp variables. 
-	
+	available from Lisp any more, don't mention as Lisp variables.
+
 2005-12-17  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* console-x.c (x_perhaps_init_unseen_key_defaults):
@@ -1928,9 +1933,9 @@
 	ASCII, or as an octal escape if it's not.
 
 	Use keyboard-coding-system rather than undecided for decoding the
-	keysym name passed to us by an input method. 
+	keysym name passed to us by an input method.
 	* file-coding.c (vars_of_file_coding):
-	Document that keyboard-coding-system is also used for X11. 
+	Document that keyboard-coding-system is also used for X11.
 
 2005-11-29  Marcus Crestani  <crestani at xemacs.org>
 
@@ -1960,7 +1965,7 @@
 2005-11-27  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	Build fixes and dead code removal.
-	
+
 	* xft-fonts.c (Ffc_pattern_destroy): Delete.
 	(syms_of_xft_fonts): Delete Ffc_pattern_destroy and comment out
 	Fxft_name_unparse.
@@ -1979,7 +1984,7 @@
     2005-11-25  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* objects-x.c: Improve comments.
-	
+
     2005-11-25  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* xft-fonts.h:
@@ -2117,7 +2122,7 @@
 
     2005-07-31  Daniel Pittman  <daniel at rimspace.net>
 
-	* xft-fonts.c: Update Ffc_list_fonts_pattern_objects to use the 
+	* xft-fonts.c: Update Ffc_list_fonts_pattern_objects to use the
 	FontConfig API nicely, preventing it from rebuilding the list of
 	available fonts on *every* access.
 
@@ -2260,13 +2265,13 @@
 	* objects-x.c (CHECKING_LANG):
 	General mule-sanity cleanup for the debug messages, to eliminate
 	the issue Giacomo Boffi saw in
-	16970.44359.621213.994821 at boffi95.stru.polimi.it. 
+	16970.44359.621213.994821 at boffi95.stru.polimi.it.
 
 	* objects-x.c (x_find_charset_font):
 	Font names are also treated as UTF-8; relatedly, when passing back
 	the font's full name, the character coverage bitmap isn't included
 	any more, because that would make it an invalid UTF-8 string.
-	
+
     2005-03-10  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* objects-x.c (charset_table): Fix ISO 639 code for Greek.  Reported
@@ -2283,7 +2288,7 @@
 
 	* objects-x-impl.h: Include lwlib-fonts.h
 
-	* objects-x.c (x_font_instance_truename): 
+	* objects-x.c (x_font_instance_truename):
 	* glyphs-x.c (update_widget_face):
 	* frame-x.c (x_update_frame_external_traits):
 	Use the correct variant of FONT_INSTANCE_{X,XFT}_FONT.
@@ -2406,11 +2411,11 @@
 
     2005-02-03  Eric Knauel  <eric at xemacs.org>
 
-	* lrecord.h (enum lrecord_type): remove lrecord for FcObjectSets 
-	
-	* xft-fonts.h (struct fc_fontset): remove lrecord for FcObjectSets 
+	* lrecord.h (enum lrecord_type): remove lrecord for FcObjectSets
 
-	* xft-fonts.c (DEFINE_LRECORD_IMPLEMENTATION): 
+	* xft-fonts.h (struct fc_fontset): remove lrecord for FcObjectSets
+
+	* xft-fonts.c (DEFINE_LRECORD_IMPLEMENTATION):
 	(Ffc_objectset_create, Ffc_objectset_p, Ffc_objectset_add)
 	(Ffc_objectset_destroy): remove lrecord for FcObjectSets
 	(Ffc_list_fonts_pattern_objects): adapt for new representation of
@@ -2512,11 +2517,11 @@
 	Incremental Garbage Collector
 
 	* .cvsignore: Add .dbxrc and .gdbinit.
-	
+
 	* .dbxrc: Remove.
 	* .dbxrc.in: New, used to generate .dbxrc: If newgc is enabled, do
 	not break on SIGBUS and SIGSEGV.
-        * .gdbinit: Remove.
+	* .gdbinit: Remove.
 	* .gdbinit: New, used to generate .gdbinit: If newgc is enabled,
 	do not break on SIGBUS and SIGSEGV.
 
@@ -2537,7 +2542,7 @@
 	recompute_need_to_garbage_collect.
 	* alloc.c (make_compiled_function): Field arguments is now a Lisp
 	object, thus init it to Qnil rather than NULL.
-	* alloc.c (struct string_chars_block): 
+	* alloc.c (struct string_chars_block):
 	* alloc.c (finalize_string):
 	* alloc.c (struct string_chars):
 	* alloc.c (make_uninit_string):
@@ -2565,7 +2570,7 @@
 	* bytecode.c (finalize_compiled_function):
 	* bytecode.c (syms_of_bytecode):
 	* bytecode.h:
-	* bytecode.h (struct compiled_function_args): 
+	* bytecode.h (struct compiled_function_args):
 	* bytecode.h (struct Lisp_Compiled_Function): Add new Lisp object:
 	compiled_function_args.
 
@@ -2715,7 +2720,7 @@
 	* glyphs.c (register_ignored_expose):
 	* glyphs.c (reinit_vars_of_glyphs):
 	* glyphs.h:
-	* glyphs.h (struct glyph_cachel): 
+	* glyphs.h (struct glyph_cachel):
 	* glyphs.h (struct expose_ignore): Add new Lisp object:
 	glyph_cachel and expose_ignore.
 
@@ -2730,7 +2735,7 @@
 
 	* lrecord.h: Remove lrecord_type numbering.
 	* lrecord.h (enum lrecord_type): Add new Lisp objects.
-	* lrecord.h (MC_ALLOC_CALL_FINALIZER): Add GC statistics.  
+	* lrecord.h (MC_ALLOC_CALL_FINALIZER): Add GC statistics.
 	* lrecord.h (enum memory_description_type): Add
 	XD_LISP_OBJECT_BLOCK_PTR.
 	* lrecord.h (XD_LISP_DYNARR_DESC): New.
@@ -2812,7 +2817,7 @@
 	* window.c (make_dummy_parent):
 	* window.c (syms_of_window): New Lisp objects: face_cachel,
 	fache_cachel_dynarr, glyph_cachel, and glyph_cachel_dynarr.
-	
+
 
 	New files:
 	* gc.c: Moved code from alloc.c.  Split up garbage_collect_1 in a
@@ -2869,7 +2874,7 @@
 
 	* window.c (change_window_height): Have change_window_height
 	change the window width when requested to do so; fixes bugs and
-	error messages with VM, BBDB. 
+	error messages with VM, BBDB.
 
 2005-11-16  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -2901,15 +2906,15 @@
 	set_lheader_implementation() -- that way, even non-MC-ALLOC builds
 	get useful uid's in their bare lrecords.  Redo related code for
 	strings so the non-ascii count that is stored in the uid isn't hosed.
-	
+
 	* events.c:
 	* events.c (deinitialize_event):
 	* events.c (zero_event):
 	Save and restore the uid around event zeroing/deadbeefing.
-	
+
 	* lisp.h:
 	Set the correct value of MAX_STRING_ASCII_BEGIN under MC_ALLOC.
-	
+
 	* lisp.h (ZEROP):
 	* lisp.h (XINT):
 	* lisp.h (CHECK_INT):
@@ -2928,7 +2933,7 @@
 	XCHAR and CHARP have additional error-checking in that they check to make
 	sure that the value in question is not just a character but a valid
 	character (i.e. its numeric value is valid).
-	
+
 	* print.c:
 	* print.c (debug_p4):
 	debug_p4 now has a useful UID in all cases and uses it; but it also prints
@@ -3177,7 +3182,7 @@
 	* frame-msw.c:
 	* frame-msw.c (decode_mswindows_frame):
 	New function, like decode_x_frame.
-	
+
 	* frame-msw.c (mswindows_window_id):
 	* frame-msw.c (mswindows_frame_property):
 	* frame-msw.c (mswindows_internal_frame_property_p):
@@ -3385,7 +3390,7 @@
 2005-10-10  Andrey Slusar <anrays at gmail.com>
 
 	* unexelf.c: define `Elfw(type)' for FreeBSD alpha and all _LP64
-	archs. 
+	archs.
 	From Dejan Lesjak <dejan.lesjak at ijs.si>
 
 2005-10-04  Stephen J. Turnbull  <stephen at xemacs.org>
@@ -3890,9 +3895,9 @@
 	New lrecord allocation and free functions:
 
 	* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
-        type checking and initializing of the lrecord_header.
+	type checking and initializing of the lrecord_header.
 	* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
-        the NOSEEUM cons counter.
+	the NOSEEUM cons counter.
 	* alloc.c (free_lrecord): New. Calls the finalizer and frees the
 	lrecord.
 	* lrecord.h: Add lrecord allocation prototypes and comments.
@@ -3922,7 +3927,7 @@
 	Allocate old lrecords with new allocator:
 
 	* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
-        defined in alloc.c.
+	defined in alloc.c.
 	* alloc.c (Fcons): Allocate with new allocator.
 	* alloc.c (noseeum_cons): Allocate with new allocator.
 	* alloc.c (make_float): Allocate with new allocator.
@@ -3989,8 +3994,8 @@
 	* alloc.c (free_marker): Use new allocator to free.
 	* alloc.c (garbage_collect_1): Remove release_breathing_space.
 	* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
-        related	stuff. Sweeping now works like this: compact string
-        chars, finalize, sweep.
+	related	stuff. Sweeping now works like this: compact string
+	chars, finalize, sweep.
 	* alloc.c (common_init_alloc_early): Remove old lrecord
 	initializations, remove breathing_space.
 	* emacs.c (Fdump_emacs): Remove release_breathing_space.
@@ -4010,39 +4015,39 @@
 	These changes build the interface to mc-alloc:
 
 	* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
-        finalize lrecords.
+	finalize lrecords.
 	* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
-        mc-alloc how to finalize for disksave.
+	mc-alloc how to finalize for disksave.
 
-        Unify lrecords and lcrecords:
+	Unify lrecords and lcrecords:
 
 	* lisp.h (struct Lisp_String): Adjust string union hack to
-        new lrecord header.
+	new lrecord header.
 	* lrecord.h: Adjust comments.
 	* lrecord.h (struct lrecord_header): The new lrecord header
-        includes type, lisp-readonly, free, and uid.
+	includes type, lisp-readonly, free, and uid.
 	* lrecord.h (set_lheader_implementation): Adjust to new
-        lrecord_header.
+	lrecord_header.
 	* lrecord.h (struct lrecord_implementation): The field basic_p
-        for indication of an old lrecord is not needed anymore, remove.
+	for indication of an old lrecord is not needed anymore, remove.
 	* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
 	* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
-        basic_p.
+	basic_p.
 	* lrecord.h (copy_sized_lrecord): Remove distinction between
-        old lrecords and lcrecords.
+	old lrecords and lcrecords.
 	* lrecord.h (copy_lrecord): Remove distinction between old
-        lrecords and lcrecords.
+	lrecords and lcrecords.
 	* lrecord.h (zero_sized_lrecord): Remove distinction between
-        old lrecords and lcrecords.
+	old lrecords and lcrecords.
 	* lrecord.h (zero_lrecord): Remove distinction between old
-        lrecords and lcrecords.
+	lrecords and lcrecords.
 
 	Remove lcrecords and lcrecord lists:
 
 	* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
 	* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
 	* alloc.c (copy_lisp_object): No more distinction between
-        lrecords and lcrecords.
+	lrecords and lcrecords.
 	* alloc.c (all_lcrecords): Not needed anymore, remove.
 	* alloc.c (make_vector_internal): Allocate as lrecord.
 	* alloc.c (make_bit_vector_internal): Allocate as lrecord.
@@ -4063,13 +4068,13 @@
 	* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
 	* alloc.c (sweep_lcrecords_1): Remove.
 	* alloc.c (common_init_alloc_early): Remove everything related
-        to lcrecords, remove old lrecord initializations,
+	to lcrecords, remove old lrecord initializations,
 	* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
 	* alloc.c (reinit_alloc_early): Remove everything related to
 	lcrecords.
 	* alloc.c (init_alloc_once_early): Remove everything related to
 	lcrecords.
- 	* buffer.c (allocate_buffer): Allocate as lrecord.
+	* buffer.c (allocate_buffer): Allocate as lrecord.
 	* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
 	* buffer.c (common_init_complex_vars_of_buffer): Allocate as
 	lrecord.
@@ -4111,7 +4116,7 @@
 	* event-stream.c (allocate_command_builder): Allocate as lrecord.
 	* event-stream.c (free_command_builder): Use lrecord functions.
 	* event-stream.c (event_stream_generate_wakeup): Allocate as
-        lrecord.
+	lrecord.
 	* event-stream.c (event_stream_resignal_wakeup): Use lrecord
 	functions.
 	* event-stream.c (event_stream_disable_wakeup): Use lrecord
@@ -4163,7 +4168,7 @@
 	* emacs.c (main_1): Remove lstream initialization.
 	* mule-charset.c (make_charset): Allocate as lrecord.
 	* objects-impl.h (struct Lisp_Color_Instance): Add
-        lrecord_header.
+	lrecord_header.
 	* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
 	* objects.c (Fmake_color_instance): Allocate as lrecord.
 	* objects.c (Fmake_font_instance): Allocate as lrecord.
@@ -4226,11 +4231,11 @@
 	* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
 	Get storage size from new allocator.
 	* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
-        storage	size from new allocator.
+	storage	size from new allocator.
 	* scrollbar.c (compute_scrollbar_instance_usage): Get storage
-        size from new allocator.
+	size from new allocator.
 	* unicode.c (compute_from_unicode_table_size_1): Get storage
-        size from new allocator.
+	size from new allocator.
 	* unicode.c (compute_to_unicode_table_size_1): Get storage size
 	from new allocator.
 	* window.c (compute_window_mirror_usage): Get storage size from
@@ -4255,7 +4260,7 @@
 
 	Strings:
 
-        * alloc.c (Fmake_string): Initialize ascii_begin to zero.
+	* alloc.c (Fmake_string): Initialize ascii_begin to zero.
 	* alloc.c (gc_count_num_short_string_in_use): Remove.
 	* alloc.c (gc_count_string_total_size): Remove.
 	* alloc.c (gc_count_short_string_total_size): Remove.
@@ -4267,7 +4272,7 @@
 
 	* alloc.c (c_readonly): Not needed anymore, remove.
 	* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
-        lheader invariants assertions.
+	lheader invariants assertions.
 	* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
 	* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
 	* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
@@ -4276,9 +4281,9 @@
 	* lisp.h (C_READONLY): Not needed anymore, remove.
 	* lisp.h (DEFUN): Allocate dynamically.
 	* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
-        remove.
+	remove.
 	* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
-        remove.
+	remove.
 	* symbols.c (guts_of_unbound_marker):
 	* symeval.h (defsubr): Allocate dynamically.
 	* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
@@ -4289,7 +4294,7 @@
 
 	* lisp.h: Add mcpro prototypes.
 	* alloc.c (common_init_alloc_early): Add initialization for
-        mcpros.
+	mcpros.
 	* alloc.c (mcpro_description_1): New.
 	* alloc.c (mcpro_description): New.
 	* alloc.c (mcpros_description_1): New.
@@ -4351,14 +4356,14 @@
 	* config.h.in: Add new flag `DUMP_IN_EXEC'
 	* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
 	* emacs.c (main_1): Flag `-si' only works if dump image is
-        written	into executable.
+	written	into executable.
 
 	Miscellanious
 
 	* lrecord.h (enum lrecord_type): Added numbers to all types,
-        very handy for debugging.
+	very handy for debugging.
 	* xemacs.def.in.in: Add mc-alloc functions to make them visible
-        to the modules.
+	to the modules.
 
 2005-04-06  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -4399,7 +4404,7 @@
 
 2005-02-24  Andrey Slusar  <anrays at gmail.com>
 
-        * unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64.
+	* unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64.
 
 2005-03-25  Marcus Crestani  <crestani at xemacs.org>
 
@@ -4494,7 +4499,7 @@
 2005-03-02  Marcus Crestani  <crestani at informatik.uni-tuebingen.de>
 
 	* redisplay.h (struct rune): make type field an int, to fix
-        KKCC marking of unions.
+	KKCC marking of unions.
 
 2005-01-13  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -4561,9 +4566,9 @@
 2005-02-26  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* select-x.c (x_reply_selection_request): Use XtRegisterDrawable
-        to tell Xt not to drop PropertyChange events destined for the
-        selection request target window. This makes incremental selection
-        transfer work, instead of looping until interrupted.
+	to tell Xt not to drop PropertyChange events destined for the
+	selection request target window. This makes incremental selection
+	transfer work, instead of looping until interrupted.
 
 2005-01-06  Andrey Slusar  <anrays at gmail.com>
 
@@ -5458,11 +5463,11 @@
 2004-10-27  Ben Wing  <ben at xemacs.org>
 
 	---------------------------------------------------------------
- 	                     MULE-RELATED WORK:
+			     MULE-RELATED WORK:
 	---------------------------------------------------------------
 
 	---------------------------
-            byte-char conversion
+	    byte-char conversion
 	---------------------------
 
 	* buffer.c:
@@ -5757,7 +5762,7 @@
 	int -> Bytecount.
 
 	---------------------------
-   	         Mule-izing
+		 Mule-izing
 	---------------------------
 
 	* device-x.c:
@@ -5858,7 +5863,7 @@
 	use in Mule-ization work in frame-x.c etc.
 
 	---------------------------
-   	         Freshening
+		 Freshening
 	---------------------------
 
 	* intl-auto-encap-win32.c:
@@ -6268,7 +6273,7 @@
 	Regenerate.
 
 	---------------------------
-   	         Unicode-work
+		 Unicode-work
 	---------------------------
 
 	* intl-win32.c (convert_multibyte_to_unicode_malloc):
@@ -6301,7 +6306,7 @@
 	Dump the blank tables as well.
 
 	---------------------------------------------------------------
-                     DOCUMENTATION, MOSTLY MULE-RELATED:
+		     DOCUMENTATION, MOSTLY MULE-RELATED:
 	---------------------------------------------------------------
 
 	* EmacsFrame.c (Xt_StringToScrollBarPlacement):
@@ -6402,7 +6407,7 @@
 	@@#### comments are out-of-date.
 
 	---------------------------------------------------------------
-                   PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
+		   PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
 	---------------------------------------------------------------
 
 	* alloc.c (lispdesc_block_size_1):
@@ -6480,7 +6485,7 @@
 	remove incorrect comment about pdump problems with gap array.
 
 	---------------------------------------------------------------
-                                    ALLOCATION
+				    ALLOCATION
 	---------------------------------------------------------------
 
 	* abbrev.c (abbrev_oblookup):
@@ -6614,7 +6619,7 @@
 	the alloca() kinds.
 
 	---------------------------------------------------------------
-                                ERROR-CHECKING
+				ERROR-CHECKING
 	---------------------------------------------------------------
 
 	* text.h (eicpy_c):
@@ -6627,7 +6632,7 @@
 
 
 	---------------------------------------------------------------
-                               MACROS IN LISP.H
+			       MACROS IN LISP.H
 	---------------------------------------------------------------
 
 	* lisp.h (GCDECL1):
@@ -6686,7 +6691,7 @@
 
 
 	---------------------------------------------------------------
-                                 SPACING FIXES
+				 SPACING FIXES
 	---------------------------------------------------------------
 
 	* callint.c (Fcall_interactively):
@@ -6697,7 +6702,7 @@
 
 
 	---------------------------------------------------------------
-                     FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
+		     FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
 	---------------------------------------------------------------
 
 	* unicode.c (init_charset_unicode_tables):
@@ -6708,7 +6713,7 @@
 	will be overridden by my other ws.
 
 	---------------------------------------------------------------
-                        FIX FOR LEAKING PROCESS HANDLES:
+			FIX FOR LEAKING PROCESS HANDLES:
 	---------------------------------------------------------------
 
 
@@ -6724,7 +6729,7 @@
 	<adrian at xemacs.org>.
 
 	---------------------------------------------------------------
-                        FIX FOR CYGWIN BUG (Unicode-related):
+			FIX FOR CYGWIN BUG (Unicode-related):
 	---------------------------------------------------------------
 
 	* unicode.c (init_charset_unicode_tables):
@@ -6732,7 +6737,7 @@
 	release 1.5.12 of Cygwin].
 
 	---------------------------------------------------------------
-                                 WARNING FIXES:
+				 WARNING FIXES:
 	---------------------------------------------------------------
 
 	* console-stream.c (init_console_stream):
@@ -6751,7 +6756,7 @@
 	Gather includes together to avoid warning.
 
 	---------------------------------------------------------------
-                        CHANGES TO INITIALIZATION ROUTINES:
+			CHANGES TO INITIALIZATION ROUTINES:
 	---------------------------------------------------------------
 
 	* buffer.c (vars_of_buffer):
@@ -6807,7 +6812,7 @@
 	in the latter calls.
 
 	---------------------------------------------------------------
-                                     ARMAGEDDON:
+				     ARMAGEDDON:
 	---------------------------------------------------------------
 
 	* alloc.c:
@@ -6841,7 +6846,7 @@
 	in places where problems would arise.
 
 	---------------------------------------------------------------
-                        CHANGES TO THE BUILD PROCEDURE:
+			CHANGES TO THE BUILD PROCEDURE:
 	---------------------------------------------------------------
 
 	* config.h.in:
@@ -7554,9 +7559,9 @@
 	* glyphs-gtk.c (gtk_xpm_instantiate): Rewrite the XPM data to
 	replace symbolic color entries with the real colors specified in
 	xpm-color-symbols, before passing the XPM to gtk.
-        * glyphs-gtk.h: Use the generic pixmap_image_instance.mask for masks,
-        instead of a GTK specific field, so that it is used in by generic
-        code.
+	* glyphs-gtk.h: Use the generic pixmap_image_instance.mask for masks,
+	instead of a GTK specific field, so that it is used in by generic
+	code.
 
 2004-05-15  Malcolm Purvis  <malcolmp at xemacs.org>
 
@@ -8797,25 +8802,25 @@
 
 2003-04-24  Matthew O. Persico  <persicom at acedsl.com>
 
-        * unicode.c: Removed trailing commas in some enums; older
-        (Solaris 2.7 cc) compiler produced volumous warnings.
+	* unicode.c: Removed trailing commas in some enums; older
+	(Solaris 2.7 cc) compiler produced volumous warnings.
 
-        * text.c: Replaced char initialization of static Ibyte
-        strcasecmp_charmap[] with octal numeric init. Apparently older
-        (Solaris 2.7 cc) compiler treats quoted octals as signed,
-        causing 256 signed-assigned-to-unsigned warnings.
+	* text.c: Replaced char initialization of static Ibyte
+	strcasecmp_charmap[] with octal numeric init. Apparently older
+	(Solaris 2.7 cc) compiler treats quoted octals as signed,
+	causing 256 signed-assigned-to-unsigned warnings.
 
-        * lrecord.h: Removed trailing commas in some enums; older
-        (Solaris 2.7 cc) compiler produced volumous warnings.
+	* lrecord.h: Removed trailing commas in some enums; older
+	(Solaris 2.7 cc) compiler produced volumous warnings.
 
-        * lisp.h: Removed trailing commas in some enums; older
-        (Solaris 2.7 cc) compiler produced volumous warnings.
+	* lisp.h: Removed trailing commas in some enums; older
+	(Solaris 2.7 cc) compiler produced volumous warnings.
 
-        * frame.c:  Removed trailing commas in some enums; older
-        (Solaris 2.7 cc) compiler produced volumous warnings.
+	* frame.c:  Removed trailing commas in some enums; older
+	(Solaris 2.7 cc) compiler produced volumous warnings.
 
-        * file-coding.h: Removed trailing commas in some enums; older
-        (Solaris 2.7 cc) compiler produced volumous warnings.
+	* file-coding.h: Removed trailing commas in some enums; older
+	(Solaris 2.7 cc) compiler produced volumous warnings.
 
 2003-04-17  Stephen J. Turnbull  <stephen at xemacs.org>
 
@@ -10154,7 +10159,7 @@
 
 2003-02-06  Andrew Begel  <abegel at CS.Berkeley.EDU>
 
-         * sysdll.c: Included lisp.h to define needed alloca_array.
+	 * sysdll.c: Included lisp.h to define needed alloca_array.
 
 2003-02-07  Jerry James  <james at xemacs.org>
 
@@ -10234,7 +10239,7 @@
 	* event-stream.c (event_stream_select_process):
 	* event-stream.c (event_stream_unselect_process):
 	* event-stream.c (event_stream_create_io_streams):
- 	* event-stream.c (event_stream_delete_io_streams):
+	* event-stream.c (event_stream_delete_io_streams):
 	* event-stream.c (event_stream_current_event_timestamp):
 	* event-stream.c (event_stream_next_event):
 	Remove unused parameter to check_event_stream_ok() and change
@@ -11878,8 +11883,8 @@
 
 2002-08-06  Jerry James  <james at xemacs.org>
 
- 	* window.c (Fsplit_window): Count only half of the divider width
- 	against the left window when splitting horizontally.
+	* window.c (Fsplit_window): Count only half of the divider width
+	against the left window when splitting horizontally.
 
 2002-07-29  Jerry James  <james at xemacs.org>
 
@@ -11984,7 +11989,7 @@
 	* tooltalk.c: tooltalk_message_description
 		      tooltalk_pattern_description
 	* ui-gtk.c: emacs_ffi_description
-	            emacs_gtk_object_description
+		    emacs_gtk_object_description
 
 	* events.c:
 	* events.h:
@@ -12020,7 +12025,7 @@
 	* device-impl.h (struct device): added enum console_variant devtype
 
 	* objects.c: image_instance_description
-	             font_instance_description
+		     font_instance_description
 	(Fmake_color_instance): added variant initialization
 	(Fmake_font_instance): added variant initialization
 	* objects-impl.h (struct Lisp_Color_Instance): added color_instance_type
@@ -12256,7 +12261,7 @@
 	    Jens Müller <jmueller at informatik.uni-tuebingen.de>
 	    Mike Sperber <mike at xemacs.org>
 
-        * lrecord.h (lrecord_type): add lrecord_type_ephemeron
+	* lrecord.h (lrecord_type): add lrecord_type_ephemeron
 	to lrecord_type enumeration.
 
 	* lisp.h (XEPHEMERON):
@@ -12270,26 +12275,26 @@
 	(EPHEMERONP):
 	(CHECK_EPHEMERON):
 	(CONCHECK_EPHEMERON):
-        (struct ephemeron): Add representation of ephemerons.
+	(struct ephemeron): Add representation of ephemerons.
 
-        * alloc.c (garbage_collect_1):
-        (finish_marking_ephemerons):
-        (prune_ephemerons): Call.
-
-        * data.c:
-        (finish_marking_ephemerons):
-        (prune_ephemerons):
-        (mark_ephemeron):
-        (print_ephemeron):
-        (ephemeron_equal)
-        (ephemeron_hash)::
-        (make_ephemeron):
-        (Fmake_ephemeron):
-        (Fephemeronp):
-        (Fephemeron_ref):
-        (syms_of_data):
-        (vars_of_data): Add implementation of ephemerons
+	* alloc.c (garbage_collect_1):
+	(finish_marking_ephemerons):
+	(prune_ephemerons): Call.
 
+	* data.c:
+	(finish_marking_ephemerons):
+	(prune_ephemerons):
+	(mark_ephemeron):
+	(print_ephemeron):
+	(ephemeron_equal)
+	(ephemeron_hash)::
+	(make_ephemeron):
+	(Fmake_ephemeron):
+	(Fephemeronp):
+	(Fephemeron_ref):
+	(syms_of_data):
+	(vars_of_data): Add implementation of ephemerons
+
 2002-06-28  Steve Youngs  <youngs at xemacs.org>
 
 	* inline.c: Include device-impl.h, extents-impl.h, frame-impl.h,
@@ -13828,7 +13833,7 @@
 2002-05-28  Ben Wing  <ben at xemacs.org>
 
 	================================================================
-   	       ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
+	       ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
 	================================================================
 
 	Standard output and standard error can be processed separately in
@@ -13836,13 +13841,13 @@
 	and its filter function.  You can specify a separate buffer for stderr
 	in `start-process' to get things started, or use the new primitives:
 
-        set-process-stderr-buffer
-        process-stderr-buffer
+	set-process-stderr-buffer
+	process-stderr-buffer
 	process-stderr-mark
-        set-process-stderr-filter
+	set-process-stderr-filter
 	process-stderr-filter
 
-        Also, process-send-region takes a 4th optional arg, a buffer.
+	Also, process-send-region takes a 4th optional arg, a buffer.
 
 	Currently always uses a pipe() under Unix to read the error output.
 	(#### Would a PTY be better?)
@@ -13963,14 +13968,14 @@
 	* gpmevent.c (Fgpm_enable):
 	* tooltalk.c:
 	* tooltalk.c (init_tooltalk):
-        set_process_filter takes an argument for stderr.
+	set_process_filter takes an argument for stderr.
 
 	================================================================
-                          NEW ERROR-TRAPPING MECHANISM
+			  NEW ERROR-TRAPPING MECHANISM
 	================================================================
 
-        Totally rewrite error trapping code to be unified and support more
-        features.  Basic function is call_trapping_problems(), which lets
+	Totally rewrite error trapping code to be unified and support more
+	features.  Basic function is call_trapping_problems(), which lets
 	you specify, by means of flags, what sorts of problems you want
 	trapped.  these can include
 
@@ -14022,7 +14027,7 @@
 	internal_catch takes another arg.
 
 	* eval.c:
-        Add long comments describing the "five lists" used to maintain
+	Add long comments describing the "five lists" used to maintain
 	state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
 
 	* backtrace.h:
@@ -14137,12 +14142,12 @@
 	* glyphs-widget.c (widget_query_geometry):
 	* glyphs-widget.c (layout_query_geometry):
 	* redisplay.h:
-        Protect calling Lisp in redisplay.
+	Protect calling Lisp in redisplay.
 
 	* insdel.c (signal_first_change):
 	* insdel.c (signal_before_change):
 	* insdel.c (signal_after_change):
-        Protect hooks against deleting existing buffers.
+	Protect hooks against deleting existing buffers.
 
 	* frame-msw.c (mswindows_init_frame_1):
 	Use EQ, not EQUAL in hash tables whose keys are just numbers.
@@ -14150,7 +14155,7 @@
 	internal_equal() can QUIT.
 
 	================================================================
-                               SIGNAL, C-G CHANGES
+			       SIGNAL, C-G CHANGES
 	================================================================
 
 	Here we change the way that C-g interacts with event reading.  The
@@ -14162,7 +14167,7 @@
 	involving enqueue/dequeue of a C-g and interaction with Vquit_flag
 	-- and it didn't work.
 
- 	Now, we simply enclose all code where we want C-g read as an event
+	Now, we simply enclose all code where we want C-g read as an event
 	with {begin/end}_dont_check_for_quit().  This completely turns off
 	the mechanism that checks (and may remove or alter) C-g in the
 	read-ahead queues, so we just get the C-g normal.
@@ -14170,8 +14175,8 @@
 	Signal.c documents this very carefully.
 
 	* cmdloop.c (Fcommand_loop_1):
-        Correct use of dont_check_for_quit to new scheme, remove old
-        out-of-date comments.
+	Correct use of dont_check_for_quit to new scheme, remove old
+	out-of-date comments.
 
 	* event-stream.c (maybe_echo_keys):
 	* event-stream.c (enqueue_command_event_1):
@@ -14200,20 +14205,20 @@
 	* signal.c (check_what_happened):
 	* signal.c (begin_dont_check_for_quit):
 	* signal.c (check_quit):
-        Cleanup.  Add large descriptive comment.
+	Cleanup.  Add large descriptive comment.
 
 	* process-unix.c (unix_open_network_stream):
 	* process-unix.c (unix_open_multicast_group):
 	* process-nt.c (nt_open_network_stream):
 	* sysdep.c (retry_read_1):
 	* sysdep.c (retry_write_1):
-        Use QUIT instead of REALLY_QUIT.
-        It's not necessary to use REALLY_QUIT and just confuses the issue.
+	Use QUIT instead of REALLY_QUIT.
+	It's not necessary to use REALLY_QUIT and just confuses the issue.
 
 	* lisp.h (INTERNAL_QUITP): Comment quit handlers.
 
 	================================================================
-                                 CONS CHANGES
+				 CONS CHANGES
 	================================================================
 
 	free_cons() now takes a Lisp_Object not the result of XCONS().
@@ -14245,18 +14250,18 @@
 	* lread.c (various):
 	* lisp.h (struct Lisp_Cons):
 	* lisp.h (cons_car):
-        Correct free_cons calling convention: now takes Lisp_Object,
-        not Lisp_Cons
+	Correct free_cons calling convention: now takes Lisp_Object,
+	not Lisp_Cons
 
 	* chartab.c (word_boundary_p):
-        Eliminate direct use of ->car, ->cdr, should be black box.
+	Eliminate direct use of ->car, ->cdr, should be black box.
 
 
 	* callint.c (quotify_args):
-        Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
+	Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
 
 	================================================================
-                           USE INTERNAL-BIND-*
+			   USE INTERNAL-BIND-*
 	================================================================
 
 	* eval.c (restore_lisp_object):
@@ -14292,17 +14297,17 @@
 	* redisplay.c (redisplay_without_hooks):
 	* menubar-x.c (pre_activate_callback):
 	* macros.c (Fexecute_kbd_macro):
-        Rewrote to use internal_bind_int() and internal_bind_lisp_object()
+	Rewrote to use internal_bind_int() and internal_bind_lisp_object()
 	in place of whatever varied and cumbersome mechanisms were
 	formerly there.
 
 
 	================================================================
-                                SPECBIND SANITY
+				SPECBIND SANITY
 	================================================================
 
 	* backtrace.h:
-        - Improved comments
+	- Improved comments
 
 	* backtrace.h (SPECBIND):
 	* backtrace.h (SPECBIND_FAST_UNSAFE):
@@ -14316,12 +14321,12 @@
 	* eval.c (record_unwind_protect):
 	* eval.c (unbind_to_1):
 	* eval.c (unbind_to_hairy):
-        Add new mechanism check_specbind_stack_sanity() for sanity
+	Add new mechanism check_specbind_stack_sanity() for sanity
 	checking code each time the catchlist or specbind stack change.
 	Removed older prototype of same mechanism.
 
 	================================================================
-                                    MISC
+				    MISC
 	================================================================
 
 	* lisp.h:
@@ -14337,13 +14342,13 @@
 
 	* print.c (debug_print_no_newline):
 	* print.c (debug_backtrace):
-        Be more careful when not initialized or in fatal error handling.
+	Be more careful when not initialized or in fatal error handling.
 
 	* search.c (looking_at_1):
 	* search.c (string_match_1):
 	* search.c (search_buffer):
 	* search.c (Fstore_match_data):
-        Eliminate running_asynch_code, an FSF holdover.
+	Eliminate running_asynch_code, an FSF holdover.
 
 	* alloc.c (vars_of_alloc):
 	* alloc.c:
@@ -14359,7 +14364,7 @@
 
 	* lisp-disunion.h:
 	* lisp-union.h:
-        Added warnings on use of VOID_TO_LISP().
+	Added warnings on use of VOID_TO_LISP().
 
 	* lisp.h:
 	Use ERROR_CHECK_STRUCTURES to turn on
@@ -14375,7 +14380,7 @@
 	but it required manual twiddling the gcpro structure.)
 
 	* lisp.h:
-        Add prototypes for new functions defined elsewhere.
+	Add prototypes for new functions defined elsewhere.
 
 2002-05-23  Ben Wing  <ben at xemacs.org>
 
@@ -14647,10 +14652,10 @@
 2002-04-23  Jerry James  <james at xemacs.org>
 
 	* select.c (Fown_selection_internal): Document connection with
-        interprogram-cut-function.
+	interprogram-cut-function.
 	* select.c (Fget_selection_internal): return Qnil if XEmacs owns
-        the selection and it does not need coercion.
-        Document connection with interprogram-paste-function.
+	the selection and it does not need coercion.
+	Document connection with interprogram-paste-function.
 
 2002-05-06  Jonathan Harris  <jonathan at xemacs.org>
 
@@ -15509,7 +15514,7 @@
 
 2002-04-30  Charles G. Waldman <cgw at xemacs.org>
 
-        * sysdep.c (sys_siglist): change "signum" to "signal"
+	* sysdep.c (sys_siglist): change "signum" to "signal"
 
 2001-04-21  Martin Buchholz  <martin at xemacs.org>
 
@@ -15520,7 +15525,7 @@
 
 	* s/linux.h (LIB_STANDARD): Define correctly for x86-64 and s390x
 	which use lib64 for 64-bit libs.
-        (START_FILES): Likewise.
+	(START_FILES): Likewise.
 
 2002-02-11  Mike Sperber  <mike at xemacs.org>
 
@@ -15627,7 +15632,7 @@
 
 2002-04-30  Charles G. Waldman <cgw at xemacs.org>
 
-        * sysdep.c (sys_siglist): change "signum" to "signal"
+	* sysdep.c (sys_siglist): change "signum" to "signal"
 
 2002-04-24  Andy Piper  <andy at xemacs.org>
 
@@ -17383,61 +17388,61 @@
 
 2002-03-16  IKEYAMA Tomonori <tomonori at suiyokai.org>
 
-        * unicode.c (add_charsets_to_precedence_list): Fix passing wrong
-        argument to XCHARSET_LEADING_BYTE.
+	* unicode.c (add_charsets_to_precedence_list): Fix passing wrong
+	argument to XCHARSET_LEADING_BYTE.
 
 2002-03-15  Jonathan Harris  <jhar at tardis.ed.ac.uk>
 
-        * intl-encap-win32.c (copy_shfileinfoa_to_shfileinfow):
-          Take size parameter and assert it's big enough.
-        * intl-encap-win32.c (qxeSHGetFileInfo):
-          Deal with the case where no fileinfo structure is passed in.
+	* intl-encap-win32.c (copy_shfileinfoa_to_shfileinfow):
+	  Take size parameter and assert it's big enough.
+	* intl-encap-win32.c (qxeSHGetFileInfo):
+	  Deal with the case where no fileinfo structure is passed in.
 
 2002-03-14  Jonathan Harris  <jhar at tardis.ed.ac.uk>
 
-        * intl-encap-win32.c: Remove EncryptFile, DecryptFile &
-          mciGetDeviceIDFromElementID - APIs are not available on Win98
-        * intl-auto-encap-win32.c: ditto
-        * intl-auto-encap-win32.h: ditto
-        * intl-encap-win32.c: Remove 'dir' command.
+	* intl-encap-win32.c: Remove EncryptFile, DecryptFile &
+	  mciGetDeviceIDFromElementID - APIs are not available on Win98
+	* intl-auto-encap-win32.c: ditto
+	* intl-auto-encap-win32.h: ditto
+	* intl-encap-win32.c: Remove 'dir' command.
 
 2002-03-13  William M. Perry  <wmperry at gnu.org>
 
-        * ui-gtk.c (__allocate_object_storage): Make static to avoid
-        warnings.
-        (type_to_marshaller_type): Ditto.
+	* ui-gtk.c (__allocate_object_storage): Make static to avoid
+	warnings.
+	(type_to_marshaller_type): Ditto.
 
-        * symsinit.h: Added some missing *_gtk_* functions to avoid
-        warnings.
+	* symsinit.h: Added some missing *_gtk_* functions to avoid
+	warnings.
 
-        * select-gtk.c: Add extern definitions of lisp_to_time and
-        time_to_lisp to avoid warnings.
+	* select-gtk.c: Add extern definitions of lisp_to_time and
+	time_to_lisp to avoid warnings.
 
-        * redisplay-gtk.c (gtk_flash): reorder select/poll stuff to avoid
-        warning about 'poll' being implicitly defined.  Mirrors change
-        made to redisplay-x.c some time ago.
-        (gtk_bevel_area): Fix unused variable warning.
+	* redisplay-gtk.c (gtk_flash): reorder select/poll stuff to avoid
+	warning about 'poll' being implicitly defined.  Mirrors change
+	made to redisplay-x.c some time ago.
+	(gtk_bevel_area): Fix unused variable warning.
 
-        * gtk-xemacs.c (smash_face_fallbacks): ifdef this out to avoid
-        warnings.
+	* gtk-xemacs.c (smash_face_fallbacks): ifdef this out to avoid
+	warnings.
 
-        * glyphs-gtk.c (write_lisp_string_to_temp_file): Fix 'grpro3'
-        typo.
-        (gtk_locate_pixmap_file): Use split_external_path instead of
-        decode_path.
+	* glyphs-gtk.c (write_lisp_string_to_temp_file): Fix 'grpro3'
+	typo.
+	(gtk_locate_pixmap_file): Use split_external_path instead of
+	decode_path.
 
-        * gccache-gtk.c (gc_cache_hash): Fix signed/unsigned warning.
+	* gccache-gtk.c (gc_cache_hash): Fix signed/unsigned warning.
 
-        * event-gtk.c: event-mods.h no longer needed.  event-gtk.h is.
+	* event-gtk.c: event-mods.h no longer needed.  event-gtk.h is.
 
-        * emacs-marshals.c (our_string_hash): Make this function static to
-        avoid warnings.
+	* emacs-marshals.c (our_string_hash): Make this function static to
+	avoid warnings.
 
-        * device-gtk.c (gtk_event_name): Fix signed/unsigned warning.
+	* device-gtk.c (gtk_event_name): Fix signed/unsigned warning.
 
-        * event-gtk.h: New header file to hold declarations from
-        event-gtk.c that are used in other files.  The quest to remove
-        compilation warnings from GTK files begins.
+	* event-gtk.h: New header file to hold declarations from
+	event-gtk.c that are used in other files.  The quest to remove
+	compilation warnings from GTK files begins.
 
 2002-03-15  Ben Wing  <ben at xemacs.org>
 
@@ -19473,7 +19478,7 @@
 2001-06-17  Ben Wing  <ben at xemacs.org>
 
 	---------------------------------------------------------------
- 	                     DOCUMENTATION FIXES:
+			     DOCUMENTATION FIXES:
 	---------------------------------------------------------------
 
 	* eval.c (Ffunction_min_args):
@@ -19483,7 +19488,7 @@
 	* elhash.c (Fremhash): Doc correction.
 
 	---------------------------------------------------------------
-	                     LISP OBJECT CLEANUP:
+			     LISP OBJECT CLEANUP:
 	---------------------------------------------------------------
 
 	* bytecode.h (wrap_compiled_function):
@@ -19637,7 +19642,7 @@
 	Use internal_object_printer, since this object should not escape.
 
 	---------------------------------------------------------------
- 	  FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
+	  FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
 	---------------------------------------------------------------
 
 	* eval.c (unwind_to_catch):
@@ -19747,7 +19752,7 @@
 	Update comments about correct marking.
 
 	---------------------------------------------------------------
- 	                  ISSUES BROUGHT UP BY MARTIN:
+			  ISSUES BROUGHT UP BY MARTIN:
 	---------------------------------------------------------------
 
 	* buffer.h (DFC_C_STRING_ALLOCA_USE_CONVERTED_DATA):
@@ -21671,24 +21676,24 @@
 
 2001-05-12  Craig Lanning  <CraigL at Knology.net>
 
-        * s\mingw32.h:
-        Properly find MinGW's <process.h> inside Cygwin's restructured
-        include directories.  Don't try to include <cygwin/version.h>
-        since we are dropping support for MinGW in versions of Cygwin
-        earlier than b21.
+	* s\mingw32.h:
+	Properly find MinGW's <process.h> inside Cygwin's restructured
+	include directories.  Don't try to include <cygwin/version.h>
+	since we are dropping support for MinGW in versions of Cygwin
+	earlier than b21.
 
 2001-05-12  Craig Lanning  <CraigL at Knology.net>
 
-        * nt.c:
-        Drop support for MinGW in versions of Cygwin before b21.
-        * sysdep.c:
-        Properly find MinGW's <process.h> inside Cygwin's restructured
-        include directories.
-        * syswindows.h:
-        Drop support for MinGW in versions of Cygwin before b21.
-        * unexcw.c:
-        Even though a.out.h is no longer detected by configure, allow
-        MinGW to use it until we figure out how to do the job with Win32.
+	* nt.c:
+	Drop support for MinGW in versions of Cygwin before b21.
+	* sysdep.c:
+	Properly find MinGW's <process.h> inside Cygwin's restructured
+	include directories.
+	* syswindows.h:
+	Drop support for MinGW in versions of Cygwin before b21.
+	* unexcw.c:
+	Even though a.out.h is no longer detected by configure, allow
+	MinGW to use it until we figure out how to do the job with Win32.
 
 
 2001-05-19  Ben Wing  <ben at xemacs.org>
@@ -25364,7 +25369,7 @@ Fatal error: assertion failed, file /pro
 	* fns.c:
 	Include <sys/loadavg.h> if available.
 	Don't declare our own getloadavg() if HAVE_GETLOADAVG.
-	* config.h.in: 	Group together getloadavg()-related macros.
+	* config.h.in:	Group together getloadavg()-related macros.
 	Use only configure-time tests to detect getloadavg().
 
 2000-07-30  Martin Buchholz  <martin at xemacs.org>
@@ -25587,12 +25592,12 @@ Fatal error: assertion failed, file /pro
 
 2000-07-15  Ben Wing  <ben at xemacs.org>
 
-        * s/cygwin32.h:
-        * s/cygwin32.h (CYGWIN_CONV_PATH):
-        Add missing logb prototype for v1.1.
-        Use post-b20 names and alias to pre-b20 names when pre-b20.
+	* s/cygwin32.h:
+	* s/cygwin32.h (CYGWIN_CONV_PATH):
+	Add missing logb prototype for v1.1.
+	Use post-b20 names and alias to pre-b20 names when pre-b20.
 
-        * s/windowsnt.h: [5].
+	* s/windowsnt.h: [5].
 
 2000-07-15  Ben Wing  <ben at xemacs.org>
 
@@ -25601,18 +25606,18 @@ Fatal error: assertion failed, file /pro
 	* Makefile.in.in (objs):
 	added win32.o, cosmetic cleanups.
 
-        * alloc.c (Fmake_byte_code):
-        [[[1]]]: Changes for new LIST_LOOP, EXTERNAL_LIST_LOOP,
-        etc. macros which declare their own args now.
+	* alloc.c (Fmake_byte_code):
+	[[[1]]]: Changes for new LIST_LOOP, EXTERNAL_LIST_LOOP,
+	etc. macros which declare their own args now.
 
-        * alloc.c (syms_of_alloc):
-        [[[2]]]: Use DEFSYMBOL, DEFKEYWORD, DEFERROR and friends.
+	* alloc.c (syms_of_alloc):
+	[[[2]]]: Use DEFSYMBOL, DEFKEYWORD, DEFERROR and friends.
 
-        * buffer.c:
-        Moved buffer-dedicated-frame, set-buffer-dedicated-frame into lisp.
+	* buffer.c:
+	Moved buffer-dedicated-frame, set-buffer-dedicated-frame into lisp.
 
-        * buffer.c (Fget_file_buffer):
-        Fixed GCPRO problem.
+	* buffer.c (Fget_file_buffer):
+	Fixed GCPRO problem.
 
 	* glyphs-msw.c (bmp_normalize):
 	(mswindows_resource_normalize): add dest_mask so that it can be
@@ -25922,446 +25927,244 @@ Fatal error: assertion failed, file /pro
 
 	* events.c (Fevent_modifier_bits): Doc fix.
 
-        	* buffer.c (get_truename_buffer): Fixed comment about GC
+		* buffer.c (get_truename_buffer): Fixed comment about GC
 	checking.
 
 	* events.c (Fevent_modifiers): Major doc addition.
 	* events.c (event_x_y_pixel_internal): Typo fix.
 	* events.c (syms_of_events): Declare new primitives.
 
-        * buffer.c (syms_of_buffer):
-        Undeclared those dedicated frame funs.
-        [2].
+	* buffer.c (syms_of_buffer):
+	Undeclared those dedicated frame funs.
+	[2].
 
-        * buffer.h:
-        Define convenience macros for internal/external conversions.
+	* buffer.h:
+	Define convenience macros for internal/external conversions.
 	[[[3]]]: Define codesys aliases Qcommand_argument_encoding
-        and Qenvironment_variable_encoding for cleaner code.
+	and Qenvironment_variable_encoding for cleaner code.
 
-        * bufslots.h:
-        Remove dedicated-frame; in lisp.
+	* bufslots.h:
+	Remove dedicated-frame; in lisp.
 
-        * bytecode.c (funcall_compiled_function):
-        [1].
+	* bytecode.c (funcall_compiled_function):
+	[1].
 
-        * bytecode.c (syms_of_bytecode):
-        [2].
+	* bytecode.c (syms_of_bytecode):
+	[2].
 
-        * console-msw.c:
-        * console-msw.c (mswindows_show_console): Rewrote.
+	* console-msw.c:
+	* console-msw.c (mswindows_show_console): Rewrote.
 
-        * console-msw.c (Fmswindows_debugging_output): New.
-        Sends to OutputDebugString (special MSWin debugger interface).
+	* console-msw.c (Fmswindows_debugging_output): New.
+	Sends to OutputDebugString (special MSWin debugger interface).
 
-        * console-msw.c (Fmswindows_message_box):
-        Fixed stupid bugs so it works when called from kill-emacs.
+	* console-msw.c (Fmswindows_message_box):
+	Fixed stupid bugs so it works when called from kill-emacs.
 
-        * console-msw.c (syms_of_console_mswindows):
-        Declare Fmswindows_debugging_output.
+	* console-msw.c (syms_of_console_mswindows):
+	Declare Fmswindows_debugging_output.
 
-        * console-msw.h:
-        New MSWin prototypes.
+	* console-msw.h:
+	New MSWin prototypes.
 
-        * console-msw.h (struct mswindows_frame):
-        New entry last-click-mods for improved button-modifier support.
+	* console-msw.h (struct mswindows_frame):
+	New entry last-click-mods for improved button-modifier support.
 
-        * console-msw.h (FRAME_MSWINDOWS_POPUP):
-        New struct entry `popup' with corresponding accessor.
+	* console-msw.h (FRAME_MSWINDOWS_POPUP):
+	New struct entry `popup' with corresponding accessor.
 
-        * console-x.c:
-        * console-x.c (split_up_display_spec):
-        * console-x.c (get_display_arg_connection):
-        * console-x.c (x_semi_canonicalize_console_connection):
-        * console-x.c (x_canonicalize_device_connection):
-        [[[6]]]: Change char to more specific type.
-        [[[8]]]: Make use of abstracting codesys aliases defined in [3], [4];
+	* console-x.c:
+	* console-x.c (split_up_display_spec):
+	* console-x.c (get_display_arg_connection):
+	* console-x.c (x_semi_canonicalize_console_connection):
+	* console-x.c (x_canonicalize_device_connection):
+	[[[6]]]: Change char to more specific type.
+	[[[8]]]: Make use of abstracting codesys aliases defined in [3], [4];
 
-        * console-x.c (x_semi_canonicalize_console_connection):
-        * console-x.c (x_canonicalize_device_connection):
-        [[[9]]]: Fix up error signalling to use new structured error system.
+	* console-x.c (x_semi_canonicalize_console_connection):
+	* console-x.c (x_canonicalize_device_connection):
+	[[[9]]]: Fix up error signalling to use new structured error system.
 
-        * console-x.h:
-        [[[4]]]: Define codesys aliases:
-        Qlwlib_encoding, Qx_atom_name_encoding, Qx_font_name_encoding,
-        Qx_color_name_encoding, Qx_display_name_encoding.
+	* console-x.h:
+	[[[4]]]: Define codesys aliases:
+	Qlwlib_encoding, Qx_atom_name_encoding, Qx_font_name_encoding,
+	Qx_color_name_encoding, Qx_display_name_encoding.
 
-        * console.h (struct console_methods):
-        New method make_dialog_box_internal supersedes older
-        popup_dialog_box method.
+	* console.h (struct console_methods):
+	New method make_dialog_box_internal supersedes older
+	popup_dialog_box method.
 
-        * data.c:
-        Define many new errors, part of new structured errors.
+	* data.c:
+	Define many new errors, part of new structured errors.
 
-        * data.c (init_errors_once_early):
-        * data.c (syms_of_data):
-        [2].
+	* data.c (init_errors_once_early):
+	* data.c (syms_of_data):
+	[2].
 
-        * device-msw.c (mswindows_init_device):
-        [[[5]]]: Cleanup to support NT 3.51.
+	* device-msw.c (mswindows_init_device):
+	[[[5]]]: Cleanup to support NT 3.51.
 
-        * device-msw.c (decode_devmode): Cleanup.
+	* device-msw.c (decode_devmode): Cleanup.
 
-        * device-msw.c (mswindows_handle_print_setup_dialog_box):
-        * device-msw.c (mswindows_handle_print_dialog_box):
-        * device-msw.c (mswindows_handle_page_setup_dialog_box):
-        * device-msw.c (syms_of_device_mswindows):
-        Delete the dialog box primitives recently introduced by Kirill and
+	* device-msw.c (mswindows_handle_print_setup_dialog_box):
+	* device-msw.c (mswindows_handle_print_dialog_box):
+	* device-msw.c (mswindows_handle_page_setup_dialog_box):
+	* device-msw.c (syms_of_device_mswindows):
+	Delete the dialog box primitives recently introduced by Kirill and
 	instead interface to general dialog box interface.
+
+	* device-x.c:
+	* device-x.c (compute_x_app_name):
+	* device-x.c (x_init_device):
+	* device-x.c (Fx_valid_keysym_name_p):
+	* device-x.c (Fx_set_font_path):
+	[6].
+	[7].
+
+	First of its kind; meant to replace XSETDEVICE.
+
+	* dialog-msw.c: Many file-dialog symbols.
+
+	* dialog-msw.c (mswindows_register_popup_frame): New.
+	* dialog-msw.c (mswindows_is_dialog_msg): New.
+	For supporting kbd traversal in dialog boxes.
+
+	* dialog-msw.c (dialog_proc):
+	Support hitting ESC in dialogs.
 
-        * device-x.c:
-        * device-x.c (compute_x_app_name):
-        * device-x.c (x_init_device):
-        * device-x.c (Fx_valid_keysym_name_p):
-        * device-x.c (Fx_set_font_path):
-        [6].
-        [7].
-
-        First of its kind; meant to replace XSETDEVICE.
-
-        * dialog-msw.c: Many file-dialog symbols.
-
-        * dialog-msw.c (mswindows_register_popup_frame): New.
-        * dialog-msw.c (mswindows_is_dialog_msg): New.
-        For supporting kbd traversal in dialog boxes.
-
-        * dialog-msw.c (dialog_proc):
-        Support hitting ESC in dialogs.
-
-        * dialog-msw.c (struct):
-        Common dialog box errors.
-
-        * dialog-msw.c (handle_file_dialog_box): New.
-        Add file dialog code.
-
-        * dialog-msw.c (handle_question_dialog_box):
-        Redo existing code to support new question dialog syntax.
-
-        * dialog-msw.c (console_type_create_dialog_mswindows):
-        We support new dialog console method.
-
-        * dialog-msw.c (syms_of_dialog_mswindows):
-        * dialog-msw.c (vars_of_dialog_mswindows):
-        New file dialog symbols, vars.
-
-        * dialog-x.c:
-        * dialog-x.c (maybe_run_dbox_text_callback):
-        * dialog-x.c (dbox_descriptor_to_widget_value):
-        * dialog-x.c (x_make_dialog_box_internal):
-        * dialog-x.c (console_type_create_dialog_x):
-        Mule-ize entire file.
-        Redo to support question dialog syntax.
-        [6].
-
-        * dialog.c:
-        * dialog.c (Fmake_dialog_box_internal):
-        * dialog.c (syms_of_dialog):
-        Kill old popup-dialog-box, replace with new primitive.
-        Just call device method or signal error.
-
-        * eldap.c (Fldap_open):
-        * eldap.c (Fldap_search_basic):
-        * eldap.c (Fldap_add):
-        * eldap.c (Fldap_modify):
-        [1].
-        [7].
-
-        * emacs.c:
-        * emacs.c (make_arg_list_1):
-        * emacs.c (make_arg_list):
-        Mule-ize call to dll_init().
-        [6].
-        [8].
-
-        * emacs.c (make_argc_argv):
-        * emacs.c (free_argc_argv):
-        * emacs.c (init_cmdargs):
-        * emacs.c (main_1):
-        * emacs.c (Fkill_emacs):
-        * emacs.c (Fdump_emacs):
-        Update comments about what can be used in syms_* etc.
-        Call init_win32() when necessary.
-        Fix up MS Win dialog box in kill-buffer to actually work right.
-        [7].
-
-        * eval.c:
-        * eval.c (For):
-        * eval.c (Fand):
-        * eval.c (Fprogn):
-        * eval.c (Fprog1):
-        * eval.c (Fprog2):
-        * eval.c (FletX):
-        * eval.c (Flet):
-        * eval.c (condition_case_3):
-        * eval.c (Feval):
-        * eval.c (function_argcount):
-        * eval.c (funcall_lambda):
-        [1].
-
-        * eval.c (type_error): New.
-        * eval.c (maybe_type_error): New.
-        * eval.c (continuable_type_error): New.
-        * eval.c (maybe_continuable_type_error): New.
-        * eval.c (type_error_with_frob): New.
-        * eval.c (maybe_type_error_with_frob): New.
-        * eval.c (continuable_type_error_with_frob): New.
-        * eval.c (maybe_continuable_type_error_with_frob): New.
-        New functions for use with structured errors.
-
-        * event-Xt.c:
-        * event-Xt.c (x_event_to_emacs_event):
-        Buttons are now modifiers too.
-
-        * event-Xt.c (emacs_Xt_current_event_timestamp):
-        Implement new event method.
-        * event-Xt.c (reinit_vars_of_event_Xt): Set it.
-
-        * event-msw.c:
-        * event-msw.c (ntpipe_shove_writer): [5].
-        * event-msw.c (mswindows_enqueue_mouse_button_event):
-        * event-msw.c (mswindows_drain_windows_queue):
-        * event-msw.c (mswindows_wnd_proc): [7].
-        * event-msw.c (mswindows_current_layout_has_AltGr): [5].
-        * event-msw.c (mswindows_modifier_state):
-        Throughout: support new button modifiers.
-
-        * event-msw.c (emacs_mswindows_current_event_timestamp):
-        Implement new event method.
-        * event-msw.c (reinit_vars_of_event_mswindows): Set it.
-
-        * event-stream.c:
-        * event-stream.c (event_stream_current_event_timestamp): New.
-        * event-stream.c (maybe_kbd_translate): New functionality.
-        * event-stream.c (vars_of_event_stream):
-        Document new kbd-translate-table functionality.
-
-        * event-stream.c (Fcurrent_event_timestamp): New.
-        New primitive for use in fabricated events.
-        * event-stream.c (syms_of_event_stream): [2]. Declare new primitive.
-
-        * events-mod.h (XEMACS_MOD_BUTTON1): new button modifiers.
-
-        * events.c:
-        * events.c (Fmake_event):
-        * events.c (WRONG_EVENT_TYPE_FOR_PROPERTY):
-        [1].
-        [9].
+	* dialog-msw.c (struct):
+	Common dialog box errors.
+
+	* dialog-msw.c (handle_file_dialog_box): New.
+	Add file dialog code.
+
+	* dialog-msw.c (handle_question_dialog_box):
+	Redo existing code to support new question dialog syntax.
+
+	* dialog-msw.c (console_type_create_dialog_mswindows):
+	We support new dialog console method.
 
-        * events.c (format_event_object): fix gcc warnings.
+	* dialog-msw.c (syms_of_dialog_mswindows):
+	* dialog-msw.c (vars_of_dialog_mswindows):
+	New file dialog symbols, vars.
 
-        * events.c (Fevent_timestamp): Document new primitives.
+	* dialog-x.c:
+	* dialog-x.c (maybe_run_dbox_text_callback):
+	* dialog-x.c (dbox_descriptor_to_widget_value):
+	* dialog-x.c (x_make_dialog_box_internal):
+	* dialog-x.c (console_type_create_dialog_x):
+	Mule-ize entire file.
+	Redo to support question dialog syntax.
+	[6].
 
-        * events.c (TIMESTAMP_HALFSPACE): New.
+	* dialog.c:
+	* dialog.c (Fmake_dialog_box_internal):
+	* dialog.c (syms_of_dialog):
+	Kill old popup-dialog-box, replace with new primitive.
+	Just call device method or signal error.
 
-        * events.c (Fevent_timestamp_lessp): New.  New primitive for
+	* eldap.c (Fldap_open):
+	* eldap.c (Fldap_search_basic):
+	* eldap.c (Fldap_add):
+	* eldap.c (Fldap_modify):
+	[1].
+	[7].
+
+	* emacs.c:
+	* emacs.c (make_arg_list_1):
+	* emacs.c (make_arg_list):
+	Mule-ize call to dll_init().
+	[6].
+	[8].
+
+	* emacs.c (make_argc_argv):
+	* emacs.c (free_argc_argv):
+	* emacs.c (init_cmdargs):
+	* emacs.c (main_1):
+	* emacs.c (Fkill_emacs):
+	* emacs.c (Fdump_emacs):
+	Update comments about what can be used in syms_* etc.
+	Call init_win32() when necessary.
+	Fix up MS Win dialog box in kill-buffer to actually work right.
+	[7].
+
+	* eval.c:
+	* eval.c (For):
+	* eval.c (Fand):
+	* eval.c (Fprogn):
+	* eval.c (Fprog1):
+	* eval.c (Fprog2):
+	* eval.c (FletX):
+	* eval.c (Flet):
+	* eval.c (condition_case_3):
+	* eval.c (Feval):
+	* eval.c (function_argcount):
+	* eval.c (funcall_lambda):
+	[1].
+
+	* eval.c (type_error): New.
+	* eval.c (maybe_type_error): New.
+	* eval.c (continuable_type_error): New.
+	* eval.c (maybe_continuable_type_error): New.
+	* eval.c (type_error_with_frob): New.
+	* eval.c (maybe_type_error_with_frob): New.
+	* eval.c (continuable_type_error_with_frob): New.
+	* eval.c (maybe_continuable_type_error_with_frob): New.
+	New functions for use with structured errors.
+
+	* event-Xt.c:
+	* event-Xt.c (x_event_to_emacs_event):
+	Buttons are now modifiers too.
+
+	* event-Xt.c (emacs_Xt_current_event_timestamp):
+	Implement new event method.
+	* event-Xt.c (reinit_vars_of_event_Xt): Set it.
+
+	* event-msw.c:
+	* event-msw.c (ntpipe_shove_writer): [5].
+	* event-msw.c (mswindows_enqueue_mouse_button_event):
+	* event-msw.c (mswindows_drain_windows_queue):
+	* event-msw.c (mswindows_wnd_proc): [7].
+	* event-msw.c (mswindows_current_layout_has_AltGr): [5].
+	* event-msw.c (mswindows_modifier_state):
+	Throughout: support new button modifiers.
+
+	* event-msw.c (emacs_mswindows_current_event_timestamp):
+	Implement new event method.
+	* event-msw.c (reinit_vars_of_event_mswindows): Set it.
+
+	* event-stream.c:
+	* event-stream.c (event_stream_current_event_timestamp): New.
+	* event-stream.c (maybe_kbd_translate): New functionality.
+	* event-stream.c (vars_of_event_stream):
+	Document new kbd-translate-table functionality.
+
+	* event-stream.c (Fcurrent_event_timestamp): New.
+	New primitive for use in fabricated events.
+	* event-stream.c (syms_of_event_stream): [2]. Declare new primitive.
+
+	* events-mod.h (XEMACS_MOD_BUTTON1): new button modifiers.
+
+	* events.c:
+	* events.c (Fmake_event):
+	* events.c (WRONG_EVENT_TYPE_FOR_PROPERTY):
+	[1].
+	[9].
+
+	* events.c (format_event_object): fix gcc warnings.
+
+	* events.c (Fevent_timestamp): Document new primitives.
+
+	* events.c (TIMESTAMP_HALFSPACE): New.
+
+	* events.c (Fevent_timestamp_lessp): New.  New primitive for
 	comparing timestamps correctly (half-space algorithm).
 
-        * events.c (Fevent_modifier_bits): Doc fix.
+	* events.c (Fevent_modifier_bits): Doc fix.
 
-        * events.c (Fevent_modifiers): Major doc addition.
-        * events.c (event_x_y_pixel_internal): Typo fix.
-        * events.c (syms_of_events): Declare new primitives.
-
-        * events.h:
-        Update long comment for button modifiers, timestamps.
-
-        * events.h (struct event_stream):
-        New current_event_timestamp method.
-
-        * extents.c:
-        * extents.c (extent_in_region_p):
-        * extents.c (decode_extent):
-        * extents.c (Fset_extent_parent):
-        * extents.c (decode_map_extents_flags):
-        Fix gcc warnings.
-        [9].
-
-        * extents.c (struct extent_at_arg):
-        * extents.c (decode_extent_at_flag):
-        * extents.c (extent_at_mapper):
-        * extents.c (extent_at_bytind):
-        * extents.c (Fextent_at): Adapt to new lower-level interface. [9].
-        * extents.c (Fextents_at): New primitive. [9].
-        * extents.c (symbol_to_glyph_layout): [9].
-        Support new primitive `extents-at'.
-
-
-        * extents.c (get_text_property_bytind):
-        extent_at_bytind has another arg.
-        [9].
-
-        * extents.c (syms_of_extents): New primitive.
-
-        * file-coding.c (Fmake_coding_system): [1].
-        * file-coding.c (subsidiary_coding_system): fix gcc warning
-        * file-coding.c (syms_of_file_coding): [2].
-
-        * fileio.c (Fexpand_file_name):
-        * fileio.c (Fsysnetunam):
-        * fileio.c (Ffile_exists_p):
-        * fileio.c (Ffile_executable_p):
-        * fileio.c (Fverify_visited_file_modtime):
-        Clean up GCPROing.
-
-        * fileio.c (syms_of_fileio): [2].
-
-        * filelock.c (lock_file_1):
-        * filelock.c (current_lock_owner):
-        * filelock.c (lock_if_free):
-        * filelock.c (lock_file):
-        * filelock.c (unlock_file):
-        Clean up GCPROing.
-
-        * fns.c (concat): Fix gcc warning.
-
-        * fns.c (Fmember):
-        * fns.c (Fold_member):
-        * fns.c (Fmemq):
-        * fns.c (Fold_memq):
-        * fns.c (memq_no_quit):
-        * fns.c (Fassoc):
-        * fns.c (Fold_assoc):
-        * fns.c (Fassq):
-        * fns.c (Fold_assq):
-        * fns.c (assq_no_quit):
-        * fns.c (Frassoc):
-        * fns.c (Fold_rassoc):
-        * fns.c (Frassq):
-        * fns.c (Fold_rassq):
-        * fns.c (rassq_no_quit):
-        * fns.c (Fdelete):
-        * fns.c (Fold_delete):
-        * fns.c (Fdelq):
-        * fns.c (Fold_delq):
-        * fns.c (delq_no_quit):
-        * fns.c (Fremassoc):
-        * fns.c (Fremassq):
-        * fns.c (remassq_no_quit):
-        * fns.c (Fremrassoc):
-        * fns.c (Fremrassq):
-        * fns.c (remrassq_no_quit):
-        * fns.c (Freverse):
-        * fns.c (mapcar1):
-        [1].
-
-        * frame-msw.c (mswindows_init_frame_1):
-        * frame-msw.c (mswindows_delete_frame):
-        Register popups with dialog code so keyboard traversing works.
-
-        * frame-tty.c (tty_raise_frame_no_select): [1].
-
-        * frame-x.c:
-        * frame-x.c (x_set_frame_text_value):
-        * frame-x.c (x_set_frame_properties):
-        * frame-x.c (x_create_widgets):
-        [7].
-
-        * frame.c:
-        * frame.c (Fmouse_pixel_position): Minor doc fixes.
-
-        Macro like wrap_device.
-
-        * general.c:
-        * general.c (SYMBOL):
-        * general.c (syms_of_general):
-        Major reorg.  This is now just a wrapper and symbols themselves
-        are listed in general-slots.h.
-
-        * glyphs-eimage.c (tiff_instantiate): Need cast to fix warning.
-        * glyphs-msw.c (mswindows_resource_instantiate): [5].
-
-        * glyphs-msw.c (mswindows_native_layout_instantiate):
-        Add DS_CONTROL so keyboard traversal will work.
-
-        * glyphs-widget.c:
-        * glyphs-widget.c (syms_of_glyphs_widget):
-        Move some symbols to general-slots.h.
-
-        * glyphs-x.c:
-        * glyphs-x.c (xbm_instantiate_1):
-        * glyphs-x.c (x_xbm_instantiate):
-        * glyphs-x.c (x_xface_instantiate):
-        * glyphs-x.c (autodetect_instantiate):
-        * glyphs-x.c (cursor_font_instantiate):
-        * glyphs-x.c (x_update_widget):
-        * glyphs-x.c (x_widget_instantiate):
-        * glyphs.c (bitmap_to_lisp_data):
-        * glyphs.c (pixmap_to_lisp_data):
-        [7].
-
-        * glyphs.c (syms_of_glyphs):
-        [2].
-
-        * gui-x.c:
-        * gui-x.c (print_widget_value):
-        * gui-x.c (menu_separator_style_and_to_external):
-        * gui-x.c (add_accel_and_to_external):
-        * gui-x.c (button_item_to_widget_value):
-        * gui-x.c (gui_items_to_widget_values_1):
-        * gui-x.c (gui_items_to_widget_values):
-        * gui-x.c (syms_of_gui_x):
-        * gui-x.c (vars_of_gui_x):
-        Mule-ize entire file.  Move menu-no-selection-hook to gui.c.
-        [9].
-
-        * gui-x.h:
-        Muleize, prototype changes matching gui-x.c.
-
-        * gui.c:
-        * gui.c (separator_string_p):
-        * gui.c (gui_item_add_keyval_pair):
-        * gui.c (make_gui_item_from_keywords_internal):
-        * gui.c (signal_too_long_error):
-        * gui.c (parse_gui_item_tree_item):
-        * gui.c (syms_of_gui):
-        * gui.c (vars_of_gui):
-        * gui.h:
-        menu-no-selection-hook moved here (used by MSWin).
-        Move some symbols to general-slots.h.
-        [6].
-        [9].
-
-        * insdel.c (get_buffer_pos_char):
-        * insdel.c (get_buffer_range_char):
-        Add GC comments.
-
-        * keymap.c (keymap_lookup_directly):
-        * keymap.c (keymap_store):
-        * keymap.c (ensure_meta_prefix_char_keymapp):
-        * keymap.c (describe_map):
-        * keymap.h:
-        Support new button modifiers.
-
-        * lisp-disunion.h (XSETOBJ):
-        Rename make_obj to wrap_object.
-
-        * lisp-union.h:
-        * lisp-union.h (make_int):
-        * lisp-union.h (make_char):
-        Support wrap_object.
-
-        * lisp.h:
-        * lisp.h (LIST_LOOP):
-        * lisp.h (EXTERNAL_LIST_LOOP):
-        * lisp.h (LIST_LOOP_2):
-        * lisp.h (EXTERNAL_LIST_LOOP_1):
-        * lisp.h (EXTERNAL_LIST_LOOP_2):
-        * lisp.h (EXTERNAL_LIST_LOOP_3):
-        * lisp.h (EXTERNAL_LIST_LOOP_4_NO_DECLARE):
-        * lisp.h (PRIVATE_EXTERNAL_LIST_LOOP_6):
-        * lisp.h (GET_EXTERNAL_LIST_LENGTH):
-        * lisp.h (EXTERNAL_ALIST_LOOP_5):
-        * lisp.h (EXTERNAL_ALIST_LOOP_6):
-        * lisp.h (EXTERNAL_ALIST_LOOP_6_NO_DECLARE):
-        * lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_5_NO_DECLARE):
-        * lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_7):
-        * lisp.h (struct Lisp_Symbol):
-        * lisp.h (maybe_continuable_error_with_frob):
-        Fix up section comments.
-        Add new types for char to indicate usage.
-        Delete symbols auto-generated from general-slots.h.
-        Add prototypes for structured error functions.
-        Add long comments describing looping macros and change interface
-        so that lvalues are automatically declared.
+	* events.c (Fevent_modifiers): Major doc addition.
+	* events.c (event_x_y_pixel_internal): Typo fix.
+	* events.c (syms_of_events): Declare new primitives.
 
 	* events.h:
 	Update long comment for button modifiers, timestamps.
@@ -26460,6 +26263,208 @@ Fatal error: assertion failed, file /pro
 	* frame.c:
 	* frame.c (Fmouse_pixel_position): Minor doc fixes.
 
+	Macro like wrap_device.
+
+	* general.c:
+	* general.c (SYMBOL):
+	* general.c (syms_of_general):
+	Major reorg.  This is now just a wrapper and symbols themselves
+	are listed in general-slots.h.
+
+	* glyphs-eimage.c (tiff_instantiate): Need cast to fix warning.
+	* glyphs-msw.c (mswindows_resource_instantiate): [5].
+
+	* glyphs-msw.c (mswindows_native_layout_instantiate):
+	Add DS_CONTROL so keyboard traversal will work.
+
+	* glyphs-widget.c:
+	* glyphs-widget.c (syms_of_glyphs_widget):
+	Move some symbols to general-slots.h.
+
+	* glyphs-x.c:
+	* glyphs-x.c (xbm_instantiate_1):
+	* glyphs-x.c (x_xbm_instantiate):
+	* glyphs-x.c (x_xface_instantiate):
+	* glyphs-x.c (autodetect_instantiate):
+	* glyphs-x.c (cursor_font_instantiate):
+	* glyphs-x.c (x_update_widget):
+	* glyphs-x.c (x_widget_instantiate):
+	* glyphs.c (bitmap_to_lisp_data):
+	* glyphs.c (pixmap_to_lisp_data):
+	[7].
+
+	* glyphs.c (syms_of_glyphs):
+	[2].
+
+	* gui-x.c:
+	* gui-x.c (print_widget_value):
+	* gui-x.c (menu_separator_style_and_to_external):
+	* gui-x.c (add_accel_and_to_external):
+	* gui-x.c (button_item_to_widget_value):
+	* gui-x.c (gui_items_to_widget_values_1):
+	* gui-x.c (gui_items_to_widget_values):
+	* gui-x.c (syms_of_gui_x):
+	* gui-x.c (vars_of_gui_x):
+	Mule-ize entire file.  Move menu-no-selection-hook to gui.c.
+	[9].
+
+	* gui-x.h:
+	Muleize, prototype changes matching gui-x.c.
+
+	* gui.c:
+	* gui.c (separator_string_p):
+	* gui.c (gui_item_add_keyval_pair):
+	* gui.c (make_gui_item_from_keywords_internal):
+	* gui.c (signal_too_long_error):
+	* gui.c (parse_gui_item_tree_item):
+	* gui.c (syms_of_gui):
+	* gui.c (vars_of_gui):
+	* gui.h:
+	menu-no-selection-hook moved here (used by MSWin).
+	Move some symbols to general-slots.h.
+	[6].
+	[9].
+
+	* insdel.c (get_buffer_pos_char):
+	* insdel.c (get_buffer_range_char):
+	Add GC comments.
+
+	* keymap.c (keymap_lookup_directly):
+	* keymap.c (keymap_store):
+	* keymap.c (ensure_meta_prefix_char_keymapp):
+	* keymap.c (describe_map):
+	* keymap.h:
+	Support new button modifiers.
+
+	* lisp-disunion.h (XSETOBJ):
+	Rename make_obj to wrap_object.
+
+	* lisp-union.h:
+	* lisp-union.h (make_int):
+	* lisp-union.h (make_char):
+	Support wrap_object.
+
+	* lisp.h:
+	* lisp.h (LIST_LOOP):
+	* lisp.h (EXTERNAL_LIST_LOOP):
+	* lisp.h (LIST_LOOP_2):
+	* lisp.h (EXTERNAL_LIST_LOOP_1):
+	* lisp.h (EXTERNAL_LIST_LOOP_2):
+	* lisp.h (EXTERNAL_LIST_LOOP_3):
+	* lisp.h (EXTERNAL_LIST_LOOP_4_NO_DECLARE):
+	* lisp.h (PRIVATE_EXTERNAL_LIST_LOOP_6):
+	* lisp.h (GET_EXTERNAL_LIST_LENGTH):
+	* lisp.h (EXTERNAL_ALIST_LOOP_5):
+	* lisp.h (EXTERNAL_ALIST_LOOP_6):
+	* lisp.h (EXTERNAL_ALIST_LOOP_6_NO_DECLARE):
+	* lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_5_NO_DECLARE):
+	* lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_7):
+	* lisp.h (struct Lisp_Symbol):
+	* lisp.h (maybe_continuable_error_with_frob):
+	Fix up section comments.
+	Add new types for char to indicate usage.
+	Delete symbols auto-generated from general-slots.h.
+	Add prototypes for structured error functions.
+	Add long comments describing looping macros and change interface
+	so that lvalues are automatically declared.
+
+	* events.h:
+	Update long comment for button modifiers, timestamps.
+
+	* events.h (struct event_stream):
+	New current_event_timestamp method.
+
+	* extents.c:
+	* extents.c (extent_in_region_p):
+	* extents.c (decode_extent):
+	* extents.c (Fset_extent_parent):
+	* extents.c (decode_map_extents_flags):
+	Fix gcc warnings.
+	[9].
+
+	* extents.c (struct extent_at_arg):
+	* extents.c (decode_extent_at_flag):
+	* extents.c (extent_at_mapper):
+	* extents.c (extent_at_bytind):
+	* extents.c (Fextent_at): Adapt to new lower-level interface. [9].
+	* extents.c (Fextents_at): New primitive. [9].
+	* extents.c (symbol_to_glyph_layout): [9].
+	Support new primitive `extents-at'.
+
+
+	* extents.c (get_text_property_bytind):
+	extent_at_bytind has another arg.
+	[9].
+
+	* extents.c (syms_of_extents): New primitive.
+
+	* file-coding.c (Fmake_coding_system): [1].
+	* file-coding.c (subsidiary_coding_system): fix gcc warning
+	* file-coding.c (syms_of_file_coding): [2].
+
+	* fileio.c (Fexpand_file_name):
+	* fileio.c (Fsysnetunam):
+	* fileio.c (Ffile_exists_p):
+	* fileio.c (Ffile_executable_p):
+	* fileio.c (Fverify_visited_file_modtime):
+	Clean up GCPROing.
+
+	* fileio.c (syms_of_fileio): [2].
+
+	* filelock.c (lock_file_1):
+	* filelock.c (current_lock_owner):
+	* filelock.c (lock_if_free):
+	* filelock.c (lock_file):
+	* filelock.c (unlock_file):
+	Clean up GCPROing.
+
+	* fns.c (concat): Fix gcc warning.
+
+	* fns.c (Fmember):
+	* fns.c (Fold_member):
+	* fns.c (Fmemq):
+	* fns.c (Fold_memq):
+	* fns.c (memq_no_quit):
+	* fns.c (Fassoc):
+	* fns.c (Fold_assoc):
+	* fns.c (Fassq):
+	* fns.c (Fold_assq):
+	* fns.c (assq_no_quit):
+	* fns.c (Frassoc):
+	* fns.c (Fold_rassoc):
+	* fns.c (Frassq):
+	* fns.c (Fold_rassq):
+	* fns.c (rassq_no_quit):
+	* fns.c (Fdelete):
+	* fns.c (Fold_delete):
+	* fns.c (Fdelq):
+	* fns.c (Fold_delq):
+	* fns.c (delq_no_quit):
+	* fns.c (Fremassoc):
+	* fns.c (Fremassq):
+	* fns.c (remassq_no_quit):
+	* fns.c (Fremrassoc):
+	* fns.c (Fremrassq):
+	* fns.c (remrassq_no_quit):
+	* fns.c (Freverse):
+	* fns.c (mapcar1):
+	[1].
+
+	* frame-msw.c (mswindows_init_frame_1):
+	* frame-msw.c (mswindows_delete_frame):
+	Register popups with dialog code so keyboard traversing works.
+
+	* frame-tty.c (tty_raise_frame_no_select): [1].
+
+	* frame-x.c:
+	* frame-x.c (x_set_frame_text_value):
+	* frame-x.c (x_set_frame_properties):
+	* frame-x.c (x_create_widgets):
+	[7].
+
+	* frame.c:
+	* frame.c (Fmouse_pixel_position): Minor doc fixes.
+
 	* frame.h (wrap_frame): New.
 	Macro like wrap_device.
 
@@ -29539,7 +29544,7 @@ Fatal error: assertion failed, file /pro
 	* alloc.c (pdump_reloc_one):
 	Minor cleanups.
 
- 	* console-msw.c:
+	* console-msw.c:
 	* console-msw.c (GetConsoleHwnd):
 	* console-msw.c (msw_hide_console):
 	* console-msw.c (msw_show_console):
@@ -31566,14 +31571,14 @@ Fatal error: assertion failed, file /pro
 	should be extended.
 
 	Assumption that .bss section should be outside the PT_LOADable
- 	segment. On IRIX with version 6.2 and above, .bss (or .sbss, if
- 	it's present) is inside the 'data' segment. This would fail the
- 	test which was used to find a segment to grow and cover new
- 	heap. Instead of this assumption, I created another one - on IRIX
- 	the segment to grow should start below .bss and it's address
- 	should extent above the end of .bss. Once this segment is
- 	identified, it's grown to accommodate the new heap and new
- 	zero-length .bss section is added at the end of .data2.
+	segment. On IRIX with version 6.2 and above, .bss (or .sbss, if
+	it's present) is inside the 'data' segment. This would fail the
+	test which was used to find a segment to grow and cover new
+	heap. Instead of this assumption, I created another one - on IRIX
+	the segment to grow should start below .bss and it's address
+	should extent above the end of .bss. Once this segment is
+	identified, it's grown to accommodate the new heap and new
+	zero-length .bss section is added at the end of .data2.
 
 2000-01-25  Martin Buchholz  <martin at xemacs.org>
 
@@ -32450,12 +32455,12 @@ Fatal error: assertion failed, file /pro
 
 	* configure.in:
 	* configure.usage:
-        Clean up Athena widget support:
+	Clean up Athena widget support:
 	- Add `with-athena' to select a variant.
 	- Remove all `athena3d' options.
 	- Robust detection of Athena libraries and headers.
-        - Refuse to build with mismatched library and headers.
-        - Only build a 3d Athena if the user asks for it.
+	- Refuse to build with mismatched library and headers.
+	- Only build a 3d Athena if the user asks for it.
 
 1999-12-21  Andy Piper  <