Merge from origin/emacs-25

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 0485f6bfd44ddbc5eb38aa5f73dba20a376993df..d87901d42b80953383cafefa34d4e4e16486e376 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -13,8 +13,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1304,7 +1304,7 @@ free_realized_fontsets (Lisp_Object base)
            {
              struct frame *f = XFRAME (FONTSET_FRAME (this));
              int face_id = XINT (XCDR (XCAR (tail)));
-             struct face *face = FACE_FROM_ID (f, face_id);
+             struct face *face = FACE_OPT_FROM_ID (f, face_id);
 
              /* Face THIS itself is also freed by the following call.  */
              free_realized_face (f, face);
@@ -1636,7 +1636,7 @@ appended.  By default, FONT-SPEC overrides the previous settings.  */)
            continue;
          if (fontset_id != FRAME_FONTSET (f))
            continue;
-         face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+         face = FACE_OPT_FROM_ID (f, DEFAULT_FACE_ID);
          if (face)
            font_object = font_load_for_lface (f, face->lface, font_spec);
          else