From f5e278c7c920bd4c316a6103e1c5e5c71a48887a Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sat, 31 Aug 1996 02:43:52 +0000
Subject: [PATCH] (Fset_face_attribute_internal): Set mouse_face_defer flag.

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

diff --git a/src/xfaces.c b/src/xfaces.c
index 50a80b6f91c..2d86cd6dd41 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1213,7 +1213,10 @@ DEFUN ("set-face-attribute-internal", Fset_face_attribute_internal,
      And we must inhibit any Expose events until the redraw is done,
      since they would try to use the invalid display faces.  */
   if (garbaged)
-    SET_FRAME_GARBAGED (f);
+    {
+      SET_FRAME_GARBAGED (f);
+      FRAME_X_DISPLAY_INFO (f)->mouse_face_defer = 1;
+    }
 
   return Qnil;
 }
-- 
2.11.4.GIT