diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:24:58 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:24:58 +0000 |
| commit | c73bd236f75b742ad4642ec94798987ae6e3e1e8 (patch) | |
| tree | ef5edc8db557fc1d25a17c379e4ae63a38b3ba5c /src/fontset.c | |
| parent | ecb21060d5c1752d41d7a742be565c59b5fcb855 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-c73bd236f75b742ad4642ec94798987ae6e3e1e8.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index 47a682cc975..9b9fc79b918 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -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" @@ -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))); } |