Rename FACE_OPT_FROM_ID to FACE_FROM_ID_OR_NULL

[gnu-emacs] / src / macfont.m

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