[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kenichi Handa]

Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1095 emacs/src/xdisp.c:1.1096
--- emacs/src/xdisp.c:1.1095    Mon May  1 01:14:09 2006
+++ emacs/src/xdisp.c   Fri May  5 11:56:31 2006
@@ -4447,6 +4447,24 @@
 
       if (id >= 0)
        {
+         struct composition *cmp = composition_table[id];
+
+         if (cmp->glyph_len == 0)
+           {
+             /* No glyph.  */
+             if (STRINGP (it->string))
+               {
+                 IT_STRING_CHARPOS (*it) = end;
+                 IT_STRING_BYTEPOS (*it) = string_char_to_byte (it->string,
+                                                                end);
+               }
+             else
+               {
+                 IT_CHARPOS (*it) = end;
+                 IT_BYTEPOS (*it) = CHAR_TO_BYTE (end);
+               }
+             return HANDLED_RECOMPUTE_PROPS;
+           }
          it->method = GET_FROM_COMPOSITION;
          it->cmp_id = id;
          it->cmp_len = COMPOSITION_LENGTH (prop);