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

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     YAMAMOTO Mitsuharu <mituharu>   07/08/27 08:33:38

Index: macterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/macterm.c,v
retrieving revision 1.214.2.7
retrieving revision 1.214.2.8
diff -u -b -r1.214.2.7 -r1.214.2.8
--- macterm.c   8 Aug 2007 07:49:15 -0000       1.214.2.7
+++ macterm.c   27 Aug 2007 08:33:37 -0000      1.214.2.8
@@ -2973,6 +2973,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],