Merged from miles@gnu.org--gnu-2005 (patch 469)

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 27295715eaf0fe312bf0431d928533bc83aeb525..e3bb1ced2f4d63c0b6d138e371fdc7318a9f85bc 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -46,6 +46,7 @@ Boston, MA 02110-1301, USA.  */
 #ifdef MAC_OS
 #include "macterm.h"
 #endif
+#include "termhooks.h"
 
 #ifdef FONTSET_DEBUG
 #undef xassert
@@ -1344,7 +1345,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
       STORE_XCHAR2B (&char2b, c1, c2);
     else
       STORE_XCHAR2B (&char2b, 0, c1);
-    rif->encode_char (c, &char2b, fontp, NULL);
+    FRAME_RIF (f)->encode_char (c, &char2b, fontp, NULL);
     code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b);
   }
   return Fcons (build_string (face->font_name), make_number (code));