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

[YAMAMOTO Mitsuharu]

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

Index: mactoolbox.c
===================================================================
RCS file: /sources/emacs/emacs/src/mactoolbox.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- mactoolbox.c        23 Apr 2008 08:56:20 -0000      1.1.2.4
+++ mactoolbox.c        11 Jul 2008 08:53:33 -0000      1.1.2.5
@@ -575,7 +575,7 @@
            int hpos, vpos, x, y;
            struct glyph_row *row;
            struct glyph *glyph;
-           XFontStruct *font;
+           struct face *face;
 
            f = mac_focus_frame (&one_mac_display_info);
            w = XWINDOW (f->selected_window);
@@ -600,9 +600,10 @@
                   + row->visible_height
                   + f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f));
 
-           font = FACE_FROM_ID (f, glyph->face_id)->font;
-           if (font)
+           face = FACE_FROM_ID (f, glyph->face_id);
+           if (face && face->font)
              {
+               XFontStruct *font = face->font;
                Fixed point_size = Long2Fix (font->mac_fontsize);
                short height = row->visible_height;
                short ascent = row->ascent;