(x_create_toolkit_scroll_bar): Don't allocate color for

pixel -1 (bug #4742).

diff --git a/src/ChangeLog b/src/ChangeLog
index b3f9d9f51cf760a9c6c911cb35a5413a317b1582..9519ac63d7c232809e3dde0ba702c8ba5d81dce7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_create_toolkit_scroll_bar): Don't allocate color for
+       pixel -1 (bug #4742).
+
 2009-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * process.c (create_pty): Remove conditionals for no longer

diff --git a/src/xterm.c b/src/xterm.c
index 5a004873507b49f4bf6bd9e4c7d26aea7a69bd75..97bfd5b2292d343a75aa6b683ae13164e80b520b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4633,18 +4633,26 @@ x_create_toolkit_scroll_bar (f, bar)
   if (f->output_data.x->scroll_bar_top_shadow_pixel == -1)
     {
       pixel = f->output_data.x->scroll_bar_background_pixel;
-      if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
-                                 &pixel, 1.2, 0x8000))
-       pixel = -1;
-      f->output_data.x->scroll_bar_top_shadow_pixel = pixel;
+      if (pixel != -1) 
+        {
+          if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f),
+                                      FRAME_X_COLORMAP (f),
+                                      &pixel, 1.2, 0x8000))
+            pixel = -1;
+          f->output_data.x->scroll_bar_top_shadow_pixel = pixel;
+        }
     }
   if (f->output_data.x->scroll_bar_bottom_shadow_pixel == -1)
     {
       pixel = f->output_data.x->scroll_bar_background_pixel;
-      if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
-                                 &pixel, 0.6, 0x4000))
-       pixel = -1;
-      f->output_data.x->scroll_bar_bottom_shadow_pixel = pixel;
+      if (pixel != -1) 
+        {
+          if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f),
+                                      FRAME_X_COLORMAP (f),
+                                      &pixel, 0.6, 0x4000))
+            pixel = -1;
+          f->output_data.x->scroll_bar_bottom_shadow_pixel = pixel;
+        }
     }
 
 #ifdef XtNbeNiceToColormap
@@ -10433,6 +10441,7 @@ x_term_init (display_name, xrm_option, resource_name)
            || !strcmp (SDATA (value), "on")))
       XSynchronize (dpyinfo->display, True);
   }
+  XSynchronize (dpyinfo->display, True);
 
   {
     Lisp_Object value;