From 95887807517a3bb4bbdeb1a52f336e45c219ee01 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Mon, 17 Oct 1994 07:25:44 +0000
Subject: [PATCH] (intern_face): Update mask properly to set stipple and
 fill_style.  Set everything all at once in XCreateGC.

---
 src/xfaces.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/xfaces.c b/src/xfaces.c
index e1240de30a..3400be7133 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;
-- 
2.20.1