# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 999780486 0
# Node ID 2c7a6a1b047eea0cd9145cee56f1f84e54e2c558
# Parent  b4ea3ae25b504ca39effe98e2209064da31c62c8
(x_set_background_color): Don't change the colors
of the X window of scroll bar widgets.

diff -r b4ea3ae25b50 -r 2c7a6a1b047e src/xfns.c
--- a/src/xfns.c	Thu Sep 06 08:49:34 2001 +0000
+++ b/src/xfns.c	Thu Sep 06 12:48:06 2001 +0000
@@ -1410,7 +1410,6 @@
   if (FRAME_X_WINDOW (f) != 0)
     {
       Display *dpy = FRAME_X_DISPLAY (f);
-      Lisp_Object bar;
       
       BLOCK_INPUT;
       XSetBackground (dpy, x->normal_gc, bg);
@@ -1418,13 +1417,19 @@
       XSetWindowBackground (dpy, FRAME_X_WINDOW (f), bg);
       XSetForeground (dpy, x->cursor_gc, bg);
 
-      for (bar = FRAME_SCROLL_BARS (f);
-	   !NILP (bar);
-	   bar = XSCROLL_BAR (bar)->next)
-	{
-	  Window window = SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar));
-	  XSetWindowBackground (dpy, window, bg);
-	}
+#ifndef USE_TOOLKIT_SCROLL_BARS /* Turns out to be annoying with
+				   toolkit scroll bars.  */
+      {
+	Lisp_Object bar;
+	for (bar = FRAME_SCROLL_BARS (f);
+	     !NILP (bar);
+	     bar = XSCROLL_BAR (bar)->next)
+	  {
+	    Window window = SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar));
+	    XSetWindowBackground (dpy, window, bg);
+	  }
+      }
+#endif /* USE_TOOLKIT_SCROLL_BARS */
 
       UNBLOCK_INPUT;
       update_face_from_frame_parameter (f, Qbackground_color, arg);