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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/07/17 23:18:59

Index: mactoolbox.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/mactoolbox.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- mactoolbox.c        2 Jun 2008 06:09:15 -0000       1.6
+++ mactoolbox.c        17 Jul 2008 23:18:58 -0000      1.7
@@ -573,7 +573,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);
@@ -598,9 +598,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;