Mercurial > emacs
comparison src/xterm.c @ 23037:88fadff500be
x_display_unibyte_char_with_fontset renamed to
unibyte_display_via_language_environment.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 15 Aug 1998 23:00:07 +0000 |
parents | 720d197458cf |
children | 4e83e072cd97 |
comparison
equal
deleted
inserted
replaced
23036:ee3a3af924b4 | 23037:88fadff500be |
---|---|
578 int highest, lowest; | 578 int highest, lowest; |
579 | 579 |
580 GLYPH_FOLLOW_ALIASES (tbase, tlen, g); | 580 GLYPH_FOLLOW_ALIASES (tbase, tlen, g); |
581 cf = (cmpcharp ? cmpcharp->face_work : FAST_GLYPH_FACE (g)); | 581 cf = (cmpcharp ? cmpcharp->face_work : FAST_GLYPH_FACE (g)); |
582 ch = FAST_GLYPH_CHAR (g); | 582 ch = FAST_GLYPH_CHAR (g); |
583 if (x_display_unibyte_char_with_fontset | 583 if (unibyte_display_via_language_environment |
584 && SINGLE_BYTE_CHAR_P (ch) | 584 && SINGLE_BYTE_CHAR_P (ch) |
585 && ch >= 160) | 585 && ch >= 160) |
586 ch = unibyte_char_to_multibyte (ch); | 586 ch = unibyte_char_to_multibyte (ch); |
587 if (gidx == 0) XSETFASTINT (first_ch, ch); | 587 if (gidx == 0) XSETFASTINT (first_ch, ch); |
588 charset = CHAR_CHARSET (ch); | 588 charset = CHAR_CHARSET (ch); |
619 int this_charset, c1, c2; | 619 int this_charset, c1, c2; |
620 | 620 |
621 g = *gp; | 621 g = *gp; |
622 GLYPH_FOLLOW_ALIASES (tbase, tlen, g); | 622 GLYPH_FOLLOW_ALIASES (tbase, tlen, g); |
623 ch = FAST_GLYPH_CHAR (g); | 623 ch = FAST_GLYPH_CHAR (g); |
624 if (x_display_unibyte_char_with_fontset | 624 if (unibyte_display_via_language_environment |
625 && SINGLE_BYTE_CHAR_P (ch) | 625 && SINGLE_BYTE_CHAR_P (ch) |
626 && ch >= 160) | 626 && ch >= 160) |
627 ch = unibyte_char_to_multibyte (ch); | 627 ch = unibyte_char_to_multibyte (ch); |
628 SPLIT_CHAR (ch, this_charset, c1, c2); | 628 SPLIT_CHAR (ch, this_charset, c1, c2); |
629 if (this_charset != charset | 629 if (this_charset != charset |