Mercurial > emacs

comparison src/xfont.c @ 90454:a8b745412821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(xfont_open, xfont_encode_char): Fix typo.
author Kenichi Handa <handa@m17n.org>
date Wed, 14 Jun 2006 04:19:13 +0000
parents 57b847825c30
children 2457d1153a8b
comparison
equal deleted inserted replaced
90453:3a78ea4d2a53 90454:a8b745412821
576 return NULL; 576 return NULL;
577 } 577 }
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
585 if (xfont->min_bounds.width == xfont->max_bounds.width) 585 if (xfont->min_bounds.width == xfont->max_bounds.width)
586 { 586 {
770 770
771 charset = CHARSET_FROM_ID (font->encoding_charset); 771 charset = CHARSET_FROM_ID (font->encoding_charset);
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 }
781 char2b.byte1 = code >> 8; 781 char2b.byte1 = code >> 8;
782 char2b.byte2 = code & 0xFF; 782 char2b.byte2 = code & 0xFF;