Mercurial > emacs

diff src/xterm.c @ 53083:bf86de5f6d07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xterm.c (x_window_to_scroll_bar): Move check of display to where window_id is compared.
author Jan Djärv <jan.h.d@swipnet.se>
date Mon, 17 Nov 2003 06:06:24 +0000
parents 1218a42792ea
children 4250e7e26247 9a1b69cfa7be
line wrap: on
line diff
--- 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);
     }