Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 765-770)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 24-25)
 * gnus--rel--5.10  (patch 222-223)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-16

1 files changed, 3 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 8b0078d6af6..6fcaa3d1294 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -371,7 +371,9 @@ static void x_check_expected_move P_ ((struct frame *, int, int));
 static void x_sync_with_move P_ ((struct frame *, int, int, int));
 static int handle_one_xevent P_ ((struct x_display_info *, XEvent *,
                                   int *, struct input_event *));
-static SIGTYPE x_connection_closed P_ ((Display *, char *)) NO_RETURN;
+/* Don't declare this NO_RETURN because we want no
+   interference with debugging failing X calls.  */
+static SIGTYPE x_connection_closed P_ ((Display *, char *));
 
 
 /* Flush display of frame F, or of all frames if F is null.  */