# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1069049184 0
# Node ID bf86de5f6d07f19aa3b52dcb66f4882008be5c6f
# Parent  1b62d2b8774fbcd69b0291e1d60d4ada8159a974
* xterm.c (x_window_to_scroll_bar): Move check of display to
  where window_id is compared.

diff -r 1b62d2b8774f -r bf86de5f6d07 src/ChangeLog
--- a/src/ChangeLog	Mon Nov 17 05:25:52 2003 +0000
+++ b/src/ChangeLog	Mon Nov 17 06:06:24 2003 +0000
@@ -1,3 +1,8 @@
+2003-11-17  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (x_window_to_scroll_bar): Move check of display to
+	where window_id is compared.
+
 2003-11-17  Kim F. Storm  <storm@cua.dk>
 
 	* dispextern.h (struct it): New member first_vpos.
diff -r 1b62d2b8774f -r bf86de5f6d07 src/xterm.c
--- a/src/xterm.c	Mon Nov 17 05:25:52 2003 +0000
+++ b/src/xterm.c	Mon Nov 17 06:06:24 2003 +0000
@@ -3877,9 +3877,6 @@
       if (! GC_FRAMEP (frame))
 	abort ();
 
-      if (FRAME_X_DISPLAY (XFRAME (frame)) != display)
-        continue;
-
       /* Scan this frame's scroll bar list for a scroll bar with the
          right window ID.  */
       condemned = FRAME_CONDEMNED_SCROLL_BARS (XFRAME (frame));
@@ -3890,7 +3887,8 @@
 			       condemned = Qnil,
 			       ! GC_NILP (bar));
 	   bar = XSCROLL_BAR (bar)->next)
-	if (SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)) == window_id)
+	if (SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)) == window_id &&
+            FRAME_X_DISPLAY (XFRAME (frame)) == display)
 	  return XSCROLL_BAR (bar);
     }