Ticket #409: emacs-23.3-wide-chars-fix.patch

src/xdisp.c

@@ -5922 +5922 @@
           int pos = (it->s ? -1
                      : STRINGP (it->string) ? IT_STRING_CHARPOS (*it)
                      : IT_CHARPOS (*it));
+          int c;
+
+          if (it->what == IT_CHARACTER)
+            c = it->char_to_display;
+          else
+            {
+              struct composition *cmp = composition_table[it->cmp_it.id];
+              int i;
 
-          it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display, pos,
-                                       it->string);
+              c = ' ';
+              for (i = 0; i < cmp->glyph_len; i++)
+                if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
+                  break;
+            }
+          it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
         }
     }
 #endif