[Emacs-diffs] Changes to emacs/src/macterm.c,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   07/08/27 08:31:07

Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- macterm.c   13 Aug 2007 13:41:15 -0000      1.230
+++ macterm.c   27 Aug 2007 08:31:07 -0000      1.231
@@ -3056,6 +3056,13 @@
   else
     {
       for (i = 0; i < s->nchars; i++, ++s->gidx)
+       if (mac_per_char_metric (GC_FONT (s->gc), s->char2b + i, 0) == NULL)
+         /* This is a nonexistent or zero-width glyph such as a
+            combining diacritic.  Draw a rectangle.  */
+         mac_draw_rectangle (s->f, s->gc,
+                             x + s->cmp->offsets[s->gidx * 2], s->y,
+                             FONT_WIDTH (GC_FONT (s->gc)) - 1, s->height - 1);
+       else
        mac_draw_image_string_16 (s->f, s->gc,
                                  x + s->cmp->offsets[s->gidx * 2],
                                  s->ybase - s->cmp->offsets[s->gidx * 2 + 1],