diff options
| author | Paul Eggert | 2011-04-18 23:44:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-18 23:44:06 -0700 |
| commit | 4ef23ecf04ac996a938f9fb0107efbc60fdc63e4 (patch) | |
| tree | cd7d2c42dea5fbad0d790d12b6e284992790b7e9 /src/term.c | |
| parent | fa3c87e1f21cd100ccb257d5dd41047d0c9a732b (diff) | |
| parent | bc4f7f3d586a8d32718e27e99226d1b5ab091db5 (diff) | |
| download | emacs-4ef23ecf04ac996a938f9fb0107efbc60fdc63e4.tar.gz emacs-4ef23ecf04ac996a938f9fb0107efbc60fdc63e4.zip | |
Merge from mainline.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c index df13d7c0db2..cae83f4d269 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -1936,6 +1936,8 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym) | |||
| 1936 | { | 1936 | { |
| 1937 | if (! STRINGP (acronym) && CHAR_TABLE_P (Vglyphless_char_display)) | 1937 | if (! STRINGP (acronym) && CHAR_TABLE_P (Vglyphless_char_display)) |
| 1938 | acronym = CHAR_TABLE_REF (Vglyphless_char_display, it->c); | 1938 | acronym = CHAR_TABLE_REF (Vglyphless_char_display, it->c); |
| 1939 | if (CONSP (acronym)) | ||
| 1940 | acronym = XCDR (acronym); | ||
| 1939 | buf[0] = '['; | 1941 | buf[0] = '['; |
| 1940 | str = STRINGP (acronym) ? SSDATA (acronym) : ""; | 1942 | str = STRINGP (acronym) ? SSDATA (acronym) : ""; |
| 1941 | for (len = 0; len < 6 && str[len] && ASCII_BYTE_P (str[len]); len++) | 1943 | for (len = 0; len < 6 && str[len] && ASCII_BYTE_P (str[len]); len++) |