Mercurial > emacs

comparison src/fontset.c @ 91041:bdb3fe0ba9fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Miles Bader <miles@gnu.org>
date Thu, 11 Oct 2007 16:22:07 +0000
parents 424b655804ca 5b644ae74c91
children 35069180a991
comparison
equal deleted inserted replaced
91040:14c4a6aac623 91041:bdb3fe0ba9fa
53 #include "w32term.h" 53 #include "w32term.h"
54 #endif 54 #endif
55 #ifdef MAC_OS 55 #ifdef MAC_OS
56 #include "macterm.h" 56 #include "macterm.h"
57 #endif 57 #endif
58 #include "termhooks.h"
58 59
59 #ifdef USE_FONT_BACKEND 60 #ifdef USE_FONT_BACKEND
60 #include "font.h" 61 #include "font.h"
61 #endif /* USE_FONT_BACKEND */ 62 #endif /* USE_FONT_BACKEND */
62 63
2142 code = ENCODE_CHAR (charset, c); 2143 code = ENCODE_CHAR (charset, c);
2143 if (code == CHARSET_INVALID_CODE (charset)) 2144 if (code == CHARSET_INVALID_CODE (charset))
2144 return (Fcons (AREF (rfont_def, 3), Qnil)); 2145 return (Fcons (AREF (rfont_def, 3), Qnil));
2145 STORE_XCHAR2B (&char2b, ((code >> 8) & 0xFF), (code & 0xFF)); 2146 STORE_XCHAR2B (&char2b, ((code >> 8) & 0xFF), (code & 0xFF));
2146 fontp = (*get_font_info_func) (f, XINT (AREF (rfont_def, 1))); 2147 fontp = (*get_font_info_func) (f, XINT (AREF (rfont_def, 1)));
2147 rif->encode_char (c, &char2b, fontp, charset, NULL); 2148 FRAME_RIF (f)->encode_char (c, &char2b, fontp, charset, NULL);
2148 code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b); 2149 code = (XCHAR2B_BYTE1 (&char2b) << 8) | XCHAR2B_BYTE2 (&char2b);
2149 return (Fcons (AREF (rfont_def, 3), make_number (code))); 2150 return (Fcons (AREF (rfont_def, 3), make_number (code)));
2150 } 2151 }
2151 return Qnil; 2152 return Qnil;
2152 } 2153 }