[Emacs-diffs] /srv/bzr/emacs/trunk r107667: * xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6

[Andreas Schwab]

------------------------------------------------------------
revno: 107667
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2012-03-24 10:29:00 +0100
message:
  * xdisp.c (produce_glyphless_glyph): Limit length of acronym to 6
  characters.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-24 08:32:50 +0000
+++ b/src/ChangeLog     2012-03-24 09:29:00 +0000
@@ -1,5 +1,8 @@
 2012-03-24  Andreas Schwab  <address@hidden>
 
+       * 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)
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-03-22 07:08:17 +0000
+++ b/src/xdisp.c       2012-03-24 09:29:00 +0000
@@ -24013,7 +24013,7 @@
          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,