Merge from emacs--devo--0

[bpt/emacs.git] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 675683b..9b9fc79 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -13,7 +13,7 @@ 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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -55,6 +55,7 @@ Boston, MA 02110-1301, USA.  */
 #ifdef MAC_OS
 #include "macterm.h"
 #endif
+#include "termhooks.h"
 
 #ifdef USE_FONT_BACKEND
 #include "font.h"
@@ -971,7 +972,7 @@ free_face_fontset (f, face)
 }
 
 
-/* Return 1 iff FACE is suitable for displaying character C.
+/* Return 1 if FACE is suitable for displaying character C.
    Otherwise return 0.  Called from the macro FACE_SUITABLE_FOR_CHAR_P
    when C is not an ASCII character.  */
 
@@ -2144,7 +2145,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
        return (Fcons (AREF (rfont_def, 3), Qnil));
       STORE_XCHAR2B (&char2b, ((code >> 8) & 0xFF), (code & 0xFF));
       fontp = (*get_font_info_func) (f, XINT (AREF (rfont_def, 1)));
-      rif->encode_char (c, &char2b, fontp, charset, NULL);
+      FRAME_RIF (f)->encode_char (c, &char2b, fontp, charset, NULL);
       code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b);
       return (Fcons (AREF (rfont_def, 3), make_number (code)));
     }