[Emacs-diffs] Changes to emacs/src/xterm.c

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.821 emacs/src/xterm.c:1.822
*** emacs/src/xterm.c:1.821     Sun Nov 16 11:05:21 2003
--- emacs/src/xterm.c   Mon Nov 17 01:06:24 2003
***************
*** 3877,3885 ****
        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));
--- 3877,3882 ----
***************
*** 3890,3896 ****
                               condemned = Qnil,
                               ! GC_NILP (bar));
           bar = XSCROLL_BAR (bar)->next)
!       if (SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)) == window_id)
          return XSCROLL_BAR (bar);
      }
  
--- 3887,3894 ----
                               condemned = Qnil,
                               ! GC_NILP (bar));
           bar = XSCROLL_BAR (bar)->next)
!       if (SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)) == window_id &&
!             FRAME_X_DISPLAY (XFRAME (frame)) == display)
          return XSCROLL_BAR (bar);
      }