* xterm.c (x_window_to_scroll_bar): Move check of display to

  where window_id is compared.

diff --git a/src/ChangeLog b/src/ChangeLog
index acbaf09b69c0ba260dd8eb7c181d8ba76d21c8d0..9d7197dc6e4c88d9d0960b5bb96a0bb7f8d6d3e3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-17  Jan Dj\e,Ad\e(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 --git a/src/xterm.c b/src/xterm.c
index a5f6c959cec09090f6e4804f6f46e724588fd02c..a31178467020f9fc32012641d322afa4ef057da3 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3877,9 +3877,6 @@ x_window_to_scroll_bar (display, window_id)
       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 @@ x_window_to_scroll_bar (display, window_id)
                               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);
     }