-#define GLYPH_FOLLOW_ALIASES(base, length, g) \
- do { \
- while (GLYPH_ALIAS_P ((base), (length), (g))) \
- (g) = GLYPH_ALIAS ((base), (g)); \
- if (!GLYPH_CHAR_VALID_P (FAST_GLYPH_CHAR (g))) \
- g = FAST_MAKE_GLYPH (' ', FAST_GLYPH_FACE (g)); \
+#define GLYPH_FOLLOW_ALIASES(base, length, g) \
+ do { \
+ while (GLYPH_ALIAS_P ((base), (length), (g))) \
+ SET_GLYPH_CHAR ((g), XINT ((base)[GLYPH_CHAR (g)])); \
+ if (!GLYPH_CHAR_VALID_P (g)) \
+ SET_GLYPH_CHAR (g, ' '); \