Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11

Merge from emacs--cvs-trunk--0

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
   src/dispextern.h (xassert): Enable unconditionally.

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

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

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

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

1 files changed, 11 insertions, 3 deletions

diff --git a/src/xterm.c b/src/xterm.c
index c54b96a19b7..137e0d2ae9e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7777,10 +7777,18 @@ x_error_handler (display, error)
    It kills all frames on the display that we got the error for.
    If that was the only one, it prints an error message and kills Emacs.  */
 
-/* It is after x_error_handler so that it won't get inlined in
-   x_error_handler.  */
+/* .gdbinit puts a breakpoint here, so make sure it is not inlined.  */
 
-static void
+#if __GNUC__ >= 3  /* On GCC 3.0 we might get a warning.  */
+#define NO_INLINE __attribute__((noinline))
+#else
+#define NO_INLINE
+#endif
+
+/* On older GCC versions, just putting x_error_quitter
+   after x_error_handler prevents inlining into the former.  */
+
+static void NO_INLINE
 x_error_quitter (display, error)
      Display *display;
      XErrorEvent *error;