From a0c6ef2d968c18ade478b6003f64e5a04dd759fb Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Mon, 17 Nov 2003 06:06:24 +0000 Subject: * xterm.c (x_window_to_scroll_bar): Move check of display to where window_id is compared. --- src/ChangeLog | 5 +++++ src/xterm.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index acbaf09b69..9d7197dc6e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-11-17 Jan Dj,Ad(Brv + + * xterm.c (x_window_to_scroll_bar): Move check of display to + where window_id is compared. + 2003-11-17 Kim F. Storm * dispextern.h (struct it): New member first_vpos. diff --git a/src/xterm.c b/src/xterm.c index a5f6c959ce..a311784670 100644 --- 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); } -- cgit v1.2.3