diff --git a/src/ChangeLog b/src/ChangeLog
index 220a32a5022..3c837ccf2b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-22  Richard Stallman  <rms@gnu.org>
+
+	* xterm.c (x_connection_closed): Remove NO_RETURN.
+
 2007-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* syntax.c (skip_chars): Update syntax-table only after we checked that
diff --git a/src/xterm.c b/src/xterm.c
index 4f77e22ac59..bc4fd366796 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -366,7 +366,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.  */