Port --enable-gcc-warnings to GCC 6.1

[gnu-emacs] / src / macfont.m

diff --git a/src/macfont.m b/src/macfont.m
index 04456283fa1877696107c9a9691fb86efe26d574..79001344769fdb8473c4f9c6db097fc270763de7 100644 (file)
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2856,7 +2856,8 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
     {
       if (s->hl == DRAW_MOUSE_FACE)
         {
-          face = FACE_FROM_ID (s->f, MOUSE_HL_INFO (s->f)->mouse_face_face_id);
+          face = FACE_OPT_FROM_ID (s->f,
+                                  MOUSE_HL_INFO (s->f)->mouse_face_face_id);
           if (!face)
             face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
         }