aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-12-12 11:31:07 +0000
committerKenichi Handa2006-12-12 11:31:07 +0000
commitf0be8ea04307cb4542596df12f1a69a9795642da (patch)
tree722405536427831c726cf984601f2aa0efac1cd2 /src
parent2da34f5083244b66eaff43ae3d1e2ed034f298c1 (diff)
downloademacs-f0be8ea04307cb4542596df12f1a69a9795642da.tar.gz
emacs-f0be8ea04307cb4542596df12f1a69a9795642da.zip
(Finternal_char_font): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 614d271e9e1..a52082e2ff4 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2031,7 +2031,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
2031 struct frame *f; 2031 struct frame *f;
2032 struct face *face; 2032 struct face *face;
2033 Lisp_Object charset, rfont_def; 2033 Lisp_Object charset, rfont_def;
2034 int charset_id; 2034 int cs_id;
2035 2035
2036 if (NILP (position)) 2036 if (NILP (position))
2037 { 2037 {
@@ -2040,7 +2040,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
2040 f = XFRAME (selected_frame); 2040 f = XFRAME (selected_frame);
2041 face_id = DEFAULT_FACE_ID; 2041 face_id = DEFAULT_FACE_ID;
2042 pos = -1; 2042 pos = -1;
2043 charset_id = -1; 2043 cs_id = -1;
2044 } 2044 }
2045 else 2045 else
2046 { 2046 {
@@ -2067,16 +2067,15 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
2067 face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0); 2067 face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0);
2068 charset = Fget_char_property (position, Qcharset, Qnil); 2068 charset = Fget_char_property (position, Qcharset, Qnil);
2069 if (CHARSETP (charset)) 2069 if (CHARSETP (charset))
2070 charset_id = XINT (CHARSET_SYMBOL_ID (charset)); 2070 cs_id = XINT (CHARSET_SYMBOL_ID (charset));
2071 else 2071 else
2072 charset_id = -1; 2072 cs_id = -1;
2073 } 2073 }
2074 if (! CHAR_VALID_P (c, 0)) 2074 if (! CHAR_VALID_P (c, 0))
2075 return Qnil; 2075 return Qnil;
2076 face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil); 2076 face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil);
2077 face = FACE_FROM_ID (f, face_id); 2077 face = FACE_FROM_ID (f, face_id);
2078 rfont_def = fontset_font (FONTSET_FROM_ID (face->fontset), c, face, 2078 rfont_def = fontset_font (FONTSET_FROM_ID (face->fontset), c, face, cs_id);
2079 charset_id);
2080#ifdef USE_FONT_BACKEND 2079#ifdef USE_FONT_BACKEND
2081 if (enable_font_backend) 2080 if (enable_font_backend)
2082 { 2081 {