Merged from miles@gnu.org--gnu-2005 (patch 34-36, 142-158)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-142
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-143
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-144
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-145
   (make-text-button): Default button type if not specified

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-146
   quick-install-emacs: Use mkdir --verbose only when requested

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-147
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-148
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-149
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-150
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-151
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-152
   Add info/dir to arch branch

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-153
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-154
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-155
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-156
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-157
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-158
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-34
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-35
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-36
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-303

1 files changed, 11 insertions, 1 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 5401fecedd5..60f24feef5b 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -119,6 +119,13 @@ enum window_part
 #define GLYPH_DEBUG 0
 #endif
 
+/* If XASSERTS is non-zero, additional consistency checks are activated.
+   Turn it off by defining the macro XASSERTS to zero.  */
+
+#ifndef XASSERTS
+#define XASSERTS 0
+#endif
+
 /* Macros to include code only if GLYPH_DEBUG != 0.  */
 
 #if GLYPH_DEBUG
@@ -127,8 +134,11 @@ enum window_part
 #define IF_DEBUG(X)     (void) 0
 #endif
 
-/* Maybe move this inside the above `#ifdef GLYPH_DEBUG' for release.  */
+#if XASSERTS
 #define xassert(X)      do {if (!(X)) abort ();} while (0)
+#else
+#define xassert(X)      (void) 0
+#endif
 
 /* Macro for displaying traces of redisplay.  If Emacs was compiled
    with GLYPH_DEBUG != 0, the variable trace_redisplay_p can be set to