(intern_face): Update mask properly to set stipple

and fill_style.  Set everything all at once in XCreateGC.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index e1240de30ad..3400be71332 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -240,14 +240,15 @@ intern_face (f, face)
 
   mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures;
   if (face->stipple && face->stipple != FACE_DEFAULT)
-    xgcv.fill_style = FillStippled;
+    {
+      xgcv.fill_style = FillStippled;
+      xgcv.stipple = x_bitmap_pixmap (f, face->stipple);
+      mask |= GCFillStyle | GCStipple;
+    }
 
   gc = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                   mask, &xgcv);
 
-  if (face->stipple && face->stipple != FACE_DEFAULT)
-    XSetStipple (FRAME_X_DISPLAY (f), gc, x_bitmap_pixmap (f, face->stipple));
-
   face->gc = gc;
 
   UNBLOCK_INPUT;