--- a/ChangeLog	Thu May 17 15:06:04 2007 +0000
+++ b/ChangeLog	Thu May 17 15:42:48 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-18  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.ac (error-checking): Reorder arguments and sync doctring.
+
 2007-03-14  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* PROBLEMS: describe crash when inserting or displaying a TAB.

--- a/configure	Thu May 17 15:06:04 2007 +0000
+++ b/configure	Thu May 17 15:42:48 2007 +0000
@@ -1210,9 +1210,9 @@
                           cost.
   --with-error-checking=TESTS
                           Compile with internal error-checking added. Causes
-                          noticeable loss of speed. Valid TESTS are `extents',
-                          `bufpos', `malloc', `gc', `types', `text',
-                          `byte_code', `glyphs', `display', `structures'.
+                          noticeable loss of speed. Valid TESTS are
+                          `byte_code', `display', `extents', `gc', `glyphs',
+                          `malloc', `structures' `text', `types'.
   --with-assertions       Compile in runtime assertions.
   --with-memory-usage-stats
                           Enable LISP memory usage API.
@@ -3794,17 +3794,18 @@
 
 fi;
 _error_checking_notfirst=""
+_error_checking_byte_code_default=""
+_error_checking_display_default=""
 _error_checking_extents_default=""
-_error_checking_types_default=""
-_error_checking_text_default=""
 _error_checking_gc_default=""
+_error_checking_glyphs_default=""
 _error_checking_malloc_default=""
-_error_checking_byte_code_default=""
-_error_checking_glyphs_default=""
-_error_checking_display_default=""
 _error_checking_structures_default=""
-_error_checking_types="extents types text gc malloc byte_code glyphs display structures"
-_error_checking_default="extents,types,text,gc,malloc,byte_code,glyphs,display,structures"
+ text
+_error_checking_types_default=""
+_error_checking__default=
+_error_checking_types="byte_code display extents gc glyphs malloc structures types "
+_error_checking_default="byte_code,display,extents,gc,glyphs,malloc,structures,types,"
 
 # If --with-error-checking or --without-error-checking were given then copy the value to the
 # equivalent enable_error-checking variable.

--- a/configure.ac	Thu May 17 15:06:04 2007 +0000
+++ b/configure.ac	Thu May 17 15:42:48 2007 +0000
@@ -979,20 +979,21 @@
 XE_MERGED_ARG([debug],
 	AS_HELP_STRING([--enable-debug],[Enable additional debugging information.  No time cost.]),
 	[], [])
+dnl Keep TESTS sorted to help with syncing doc to reality.
 XE_COMPLEX_ARG([error-checking],
 	AS_HELP_STRING([--enable-error-checking=TESTS],[Compile with internal error-checking added.
                         Causes noticeable loss of speed.  Valid TESTS
-                        are `extents', `bufpos', `malloc', `gc', `types', `text', `byte_code', `glyphs', `display', `structures'.]),
+                        are `byte_code', `display', `extents', `gc', `glyphs', `malloc', `structures' `text', `types'.]),
 	[], [],
-[XE_COMPLEX_OPTION([extents],[""]),
- XE_COMPLEX_OPTION([types],[""]),
- XE_COMPLEX_OPTION([text],[""]),
+[XE_COMPLEX_OPTION([byte_code],[""]),
+ XE_COMPLEX_OPTION([display],[""]),
+ XE_COMPLEX_OPTION([extents],[""]),
  XE_COMPLEX_OPTION([gc],[""]),
+ XE_COMPLEX_OPTION([glyphs],[""]),
  XE_COMPLEX_OPTION([malloc],[""]),
- XE_COMPLEX_OPTION([byte_code],[""]),
- XE_COMPLEX_OPTION([glyphs],[""]),
- XE_COMPLEX_OPTION([display],[""]),
- XE_COMPLEX_OPTION([structures],[""])])
+ XE_COMPLEX_OPTION([structures],[""])
+ XE_COMPLEX_OPTION([text],[""]),
+ XE_COMPLEX_OPTION([types],[""]),])
 XE_MERGED_ARG([assertions],
 	AS_HELP_STRING([--enable-assertions],[Compile in runtime assertions.]),
 	[], [])

--- a/src/ChangeLog	Thu May 17 15:06:04 2007 +0000
+++ b/src/ChangeLog	Thu May 17 15:42:48 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-18  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* config.h.in (ERROR_CHECK_BYTE_CODE): Alphabetize ERROR_CHECK_*.
+
 2007-04-30  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* unicode.c:

--- a/src/config.h.in	Thu May 17 15:06:04 2007 +0000
+++ b/src/config.h.in	Thu May 17 15:42:48 2007 +0000
@@ -579,43 +579,46 @@
 
 /* Define one or more of the following if you want lots of extra checks
    (e.g. structure validation) compiled in.  These should be turned
-   on during the beta-test cycle. */
+   on during the beta-test cycle.
+
+   Keep macro names sorted to help with syncing this file to configure.ac.
+   Don't forget the ERROR_CHECK_ALL stuff at the end of this file. */
+
+/* Minor sanity checking of the bytecode interpreter.  Useful for
+   debugging the byte compiler.  */
+#undef ERROR_CHECK_BYTE_CODE
+
+/* Sanity-check the redisplay structures after each modification. */
+#undef ERROR_CHECK_DISPLAY
 
 /* Check the entire extent structure of a buffer each time an extent
    change is done, and do other extent-related checks. */
 #undef ERROR_CHECK_EXTENTS
 
-/* Turn on checks related to types -- make sure that all X... macros are
-   dereferencing the correct type, and that all XSET... macros (as much as
-   possible) are setting the correct type of structure; check any other
-   places that a specific type is expected. */
-#undef ERROR_CHECK_TYPES
+/* Attempt to catch bugs related to garbage collection (e.g. not GCPRO'ing). */
+#undef ERROR_CHECK_GC
+
+/* Minor sanity checking of glyphs, especially subwindows and
+   widgets. */
+#undef ERROR_CHECK_GLYPHS
+
+/* Attempt to catch freeing of a non-malloc()ed block, heap corruption, etc. */
+#undef ERROR_CHECK_MALLOC
+
+/* Define for any sanity checks on structures that are not handled by a
+   more specific error-checking type. */
+#undef ERROR_CHECK_STRUCTURES
 
 /* Turn on checks related to text -- check that text in strings and buffers
    is in a valid format before we use it, check that buffer positions are
    valid, etc. */
 #undef ERROR_CHECK_TEXT
 
-/* Attempt to catch bugs related to garbage collection (e.g. not GCPRO'ing). */
-#undef ERROR_CHECK_GC
-
-/* Attempt to catch freeing of a non-malloc()ed block, heap corruption, etc. */
-#undef ERROR_CHECK_MALLOC
-
-/* Minor sanity checking of the bytecode interpreter.  Useful for
-   debugging the byte compiler.  */
-#undef ERROR_CHECK_BYTE_CODE
-
-/* Minor sanity checking of glyphs, especially subwindows and
-   widgets. */
-#undef ERROR_CHECK_GLYPHS
-
-/* Sanity-check the redisplay structures after each modification. */
-#undef ERROR_CHECK_DISPLAY
-
-/* Define for any sanity checks on structures that are not handled by a
-   more specific error-checking type. */
-#undef ERROR_CHECK_STRUCTURES
+/* Turn on checks related to types -- make sure that all X... macros are
+   dereferencing the correct type, and that all XSET... macros (as much as
+   possible) are setting the correct type of structure; check any other
+   places that a specific type is expected. */
+#undef ERROR_CHECK_TYPES
 
 /* Define DEBUG_XEMACS if you want extra debugging code compiled in.
    This is mainly intended for use by developers. */
@@ -1132,16 +1135,19 @@
    merge the two. */
 #define USE_C_FONT_LOCK
 
+/* Keep the #defines sorted.
+   #### Can this code ever be executed?  I guess if a developer #defines
+   ERROR_CHECK_ALL above the #include it could be useful. */
 #ifdef ERROR_CHECK_ALL
+#define ERROR_CHECK_BYTE_CODE
+#define ERROR_CHECK_DISPLAY
 #define ERROR_CHECK_EXTENTS
-#define ERROR_CHECK_TYPES
-#define ERROR_CHECK_TEXT
 #define ERROR_CHECK_GC
+#define ERROR_CHECK_GLYPHS
 #define ERROR_CHECK_MALLOC
-#define ERROR_CHECK_BYTE_CODE
-#define ERROR_CHECK_GLYPHS
-#define ERROR_CHECK_DISPLAY
 #define ERROR_CHECK_STRUCTURES
+#define ERROR_CHECK_TEXT
+#define ERROR_CHECK_TYPES
 #endif /* ERROR_CHECK_ALL */
 
 #endif /* _SRC_CONFIG_H_ */