diff options
| author | Kenichi Handa | 2007-12-25 10:31:10 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-12-25 10:31:10 +0000 |
| commit | 21138cff06bbcbfd80bdde681c871defa8877362 (patch) | |
| tree | fd0ba121e6f72e7b9b705c5b2883d42edfacbfd7 /src | |
| parent | b5b2545a19d6834e49aaf8f8add0d8b4b44e9d7d (diff) | |
| download | emacs-21138cff06bbcbfd80bdde681c871defa8877362.tar.gz emacs-21138cff06bbcbfd80bdde681c871defa8877362.zip | |
(xfont_encode_char): Use the macro FONT_INVALID_CODE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfont.c b/src/xfont.c index 637f3d29d32..b759ee05294 100644 --- a/src/xfont.c +++ b/src/xfont.c | |||
| @@ -717,16 +717,16 @@ xfont_encode_char (font, c) | |||
| 717 | charset = CHARSET_FROM_ID (font->encoding_charset); | 717 | charset = CHARSET_FROM_ID (font->encoding_charset); |
| 718 | code = ENCODE_CHAR (charset, c); | 718 | code = ENCODE_CHAR (charset, c); |
| 719 | if (code == CHARSET_INVALID_CODE (charset)) | 719 | if (code == CHARSET_INVALID_CODE (charset)) |
| 720 | return 0xFFFFFFFF; | 720 | return FONT_INVALID_CODE; |
| 721 | if (font->repertory_charset >= 0) | 721 | if (font->repertory_charset >= 0) |
| 722 | { | 722 | { |
| 723 | charset = CHARSET_FROM_ID (font->repertory_charset); | 723 | charset = CHARSET_FROM_ID (font->repertory_charset); |
| 724 | return (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset) | 724 | return (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset) |
| 725 | ? code : 0xFFFFFFFF); | 725 | ? code : FONT_INVALID_CODE); |
| 726 | } | 726 | } |
| 727 | char2b.byte1 = code >> 8; | 727 | char2b.byte1 = code >> 8; |
| 728 | char2b.byte2 = code & 0xFF; | 728 | char2b.byte2 = code & 0xFF; |
| 729 | return (xfont_get_pcm (font->font.font, &char2b) ? code : 0xFFFFFFFF); | 729 | return (xfont_get_pcm (font->font.font, &char2b) ? code : FONT_INVALID_CODE); |
| 730 | } | 730 | } |
| 731 | 731 | ||
| 732 | static int | 732 | static int |