Merged in changes from CVS trunk (Jan Djärv has fixed the XSync call in xterm.c, no need to disable it anymore).

Patches applied:

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

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

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


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

3 files changed, 25 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cbf06bc480f..d49514b2fc0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
+
+        * xfns.c (x_window_to_frame, x_any_window_to_frame)
+        (x_non_menubar_window_to_frame, x_menubar_window_to_frame)
+        (x_top_window_to_frame): Return 0 if wdesc is None.
+
 2004-08-22  Richard M. Stallman  <rms@gnu.org>
 
         * process.c (process_send_signal) [SIGNALS_VIA_CHARACTERS,
diff --git a/src/xfns.c b/src/xfns.c
index 762b45d0089..e03edbbec89 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -293,6 +293,8 @@ x_window_to_frame (dpyinfo, wdesc)
   Lisp_Object tail, frame;
   struct frame *f;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -342,6 +344,8 @@ x_any_window_to_frame (dpyinfo, wdesc)
   struct frame *f, *found;
   struct x_output *x;
 
+  if (wdesc == None) return NULL;
+
   found = NULL;
   for (tail = Vframe_list; GC_CONSP (tail) && !found; tail = XCDR (tail))
     {
@@ -396,6 +400,8 @@ x_non_menubar_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -442,6 +448,8 @@ x_menubar_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -487,6 +495,8 @@ x_top_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
diff --git a/src/xterm.c b/src/xterm.c
index eb455522d1c..c1edf49aca7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7608,15 +7608,13 @@ static Lisp_Object
 x_catch_errors_unwind (old_val)
      Lisp_Object old_val;
 {
-  Lisp_Object first;
-
-  first = XCAR (old_val);
-
-#if 0  /* XXX This has dumped core on me several times when my X
-          server crashed.  If this call is important, maybe we should
-          check that the display is still alive. -- lorentey */
-  XSync (XSAVE_VALUE (first)->pointer, False);
-#endif
+  Lisp_Object first = XCAR (old_val);
+  Display *dpy = XSAVE_VALUE (first)->pointer;
+  
+  /* The display may have been closed before this function is called.
+     Check if it is still open before calling XSync.  */
+  if (x_display_info_for_display (dpy) != 0)
+    XSync (dpy, False);
 
   x_error_message_string = XCDR (old_val);
   return Qnil;