From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 29 Aug 2002 14:41:28 +0000 (+0000)
Subject: (PRODUCE_GLYPHS): Set inhibit_free_realized_faces
X-Git-Tag: ttn-vms-21-2-B4~13508
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18155a1d5a93cec23255becab15f26e77cace9e7;p=emacs.git

(PRODUCE_GLYPHS): Set inhibit_free_realized_faces
when iterator is adding glyphs to a glyph matrix.
---

diff --git a/src/dispextern.h b/src/dispextern.h
index 682bf0b8f3c..5d82f6f71c1 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1852,10 +1852,16 @@ struct it
 /* Call produce_glyphs or produce_glyphs_hook, if set.  Shortcut to
    avoid the function call overhead.  */
 
-#define PRODUCE_GLYPHS(IT)			\
-     (rif					\
-      ? rif->produce_glyphs ((IT))		\
-      : produce_glyphs ((IT)))
+#define PRODUCE_GLYPHS(IT) 			\
+     do {					\
+       extern int inhibit_free_realized_faces;	\
+       if (rif != NULL)				\
+	 rif->produce_glyphs ((IT));		\
+       else					\
+	 produce_glyphs ((IT));			\
+       if ((IT)->glyph_row != NULL)		\
+	 inhibit_free_realized_faces = 1;	\
+     } while (0)
 
 /* Bit-flags indicating what operation move_it_to should perform.  */