aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-06-14 04:19:13 +0000
committerKenichi Handa2006-06-14 04:19:13 +0000
commit1886668df2c5b8a0e3b97f8591c9e76c4c40ae5b (patch)
treee01b5fcc2ee624aee940f13a23830dd8eb6dfbe0 /src
parente2a3f5b27dd81ce57a7155e525a957187f47d8d4 (diff)
downloademacs-1886668df2c5b8a0e3b97f8591c9e76c4c40ae5b.tar.gz
emacs-1886668df2c5b8a0e3b97f8591c9e76c4c40ae5b.zip
(xfont_open, xfont_encode_char): Fix typo.
Diffstat (limited to 'src')
-rw-r--r--src/xfont.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfont.c b/src/xfont.c
index ed7e581eabb..a32f84b756f 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -578,7 +578,7 @@ xfont_open (f, entity, pixel_size)
578 bcopy (name, font->font.name, len + 1); 578 bcopy (name, font->font.name, len + 1);
579 font->font.charset = encoding->id; 579 font->font.charset = encoding->id;
580 font->encoding_charset = encoding->id; 580 font->encoding_charset = encoding->id;
581 font->repertory_charet = repertory ? repertory->id : -1; 581 font->repertory_charset = repertory ? repertory->id : -1;
582 font->ascent = xfont->ascent; 582 font->ascent = xfont->ascent;
583 font->descent = xfont->descent; 583 font->descent = xfont->descent;
584 584
@@ -772,9 +772,9 @@ xfont_encode_char (font, c)
772 code = ENCODE_CHAR (charset, c); 772 code = ENCODE_CHAR (charset, c);
773 if (code == CHARSET_INVALID_CODE (charset)) 773 if (code == CHARSET_INVALID_CODE (charset))
774 return 0xFFFFFFFF; 774 return 0xFFFFFFFF;
775 if (font->repertory_charet >= 0) 775 if (font->repertory_charset >= 0)
776 { 776 {
777 charset = CHARSET_FROM_ID (font->repertory_charet); 777 charset = CHARSET_FROM_ID (font->repertory_charset);
778 return (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset) 778 return (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset)
779 ? code : 0xFFFFFFFF); 779 ? code : 0xFFFFFFFF);
780 } 780 }