# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 797194314 0
# Node ID dd1c883953a211283c75bd89d2a015f1f2dc240f
# Parent  e9702b7116403bf767a66ebedf7da717b6d76f77
(x_window_to_frame): Skip non-X frames before testing dpyinfo.
[USE_X_TOOLKIT] (x_any_window_to_frame, x_top_window_to_frame): Ditto.

diff -r e9702b711640 -r dd1c883953a2 src/xfns.c
--- a/src/xfns.c	Thu Apr 06 12:18:08 1995 +0000
+++ b/src/xfns.c	Thu Apr 06 18:51:54 1995 +0000
@@ -276,11 +276,9 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
 #ifdef USE_X_TOOLKIT
-      if (f->display.nothing == 1) 
-	return 0;
       if ((f->display.x->edit_widget 
 	   && XtWindow (f->display.x->edit_widget) == wdesc)
           || f->display.x->icon_desc == wdesc)
@@ -313,10 +311,8 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
-      if (f->display.nothing == 1) 
-	return 0;
       x = f->display.x;
       /* This frame matches if the window is any of its widgets.  */
       if (wdesc == XtWindow (x->widget) 
@@ -348,10 +344,8 @@
       if (!GC_FRAMEP (frame))
         continue;
       f = XFRAME (frame);
-      if (FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+      if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
 	continue;
-      if (f->display.nothing == 1) 
-	return 0;
       x = f->display.x;
       /* This frame matches if the window is its topmost widget.  */
       if (wdesc == XtWindow (x->widget))