Merge master into feature/improved-locked-narrowing.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index b283cef7cde..491ba338821 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -1584,6 +1584,8 @@ pgtk_draw_glyphless_glyph_string_foreground (struct glyph_string *s)
                    ? CHAR_TABLE_REF (Vglyphless_char_display,
                                      glyph->u.glyphless.ch)
                    : XCHAR_TABLE (Vglyphless_char_display)->extras[0]);
+              if (CONSP (acronym))
+                acronym = XCAR (acronym);
               if (STRINGP (acronym))
                 str = SSDATA (acronym);
             }