(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 682bf0b8f3c521faa0a317356ed697031f80a952..5d82f6f71c1bfab51f601159100df235b015de02 100644 (file)
--- 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.  */