From: Andreas Schwab Date: Sat, 24 Mar 2012 09:29:00 +0000 (+0100) Subject: * xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6 X-Git-Tag: emacs-pretest-24.0.05~65 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ed795237554b555fcfa3f4d0d6710f88469a491;p=emacs.git * xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6 characters. --- diff --git a/src/ChangeLog b/src/ChangeLog index 11676be8348..182493abe67 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-03-24 Andreas Schwab + * xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6 + characters. + * xterm.c (XTread_socket): Only modify handling_signal if !SYNC_INPUT. (Bug#11080) diff --git a/src/xdisp.c b/src/xdisp.c index 0d23d72dd7b..97364e785cb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -24013,7 +24013,7 @@ produce_glyphless_glyph (struct it *it, int for_no_font, Lisp_Object acronym) sprintf (buf, "%0*X", it->c < 0x10000 ? 4 : 6, it->c); str = buf; } - for (len = 0; str[len] && ASCII_BYTE_P (str[len]); len++) + for (len = 0; str[len] && ASCII_BYTE_P (str[len]) && len < 6; len++) code[len] = font->driver->encode_char (font, str[len]); upper_len = (len + 1) / 2; font->driver->text_extents (font, code, upper_len,