diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 4 | ||||
| -rw-r--r-- | src/xterm.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index 50058a58d9c..43fb3d60b3a 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -580,7 +580,7 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp) | |||
| 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); |
| @@ -621,7 +621,7 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp) | |||
| 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); |
diff --git a/src/xterm.h b/src/xterm.h index c2d65410ce6..b6803aa3cae 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -312,7 +312,7 @@ extern Lisp_Object x_display_name_list; | |||
| 312 | extern Lisp_Object Vx_pixel_size_width_font_regexp; | 312 | extern Lisp_Object Vx_pixel_size_width_font_regexp; |
| 313 | 313 | ||
| 314 | /* A flag to control how to display unibyte 8-bit character. */ | 314 | /* A flag to control how to display unibyte 8-bit character. */ |
| 315 | extern int x_display_unibyte_char_with_fontset; | 315 | extern int unibyte_display_via_language_environment; |
| 316 | 316 | ||
| 317 | extern struct x_display_info *x_display_info_for_display (); | 317 | extern struct x_display_info *x_display_info_for_display (); |
| 318 | extern struct x_display_info *x_display_info_for_name (); | 318 | extern struct x_display_info *x_display_info_for_name (); |