x_display_unibyte_char_with_fontset renamed to

unibyte_display_via_language_environment.

diff --git a/src/xterm.c b/src/xterm.c
index 50058a58d9c75bf1f22730af5f30c2a4a421fe3c..43fb3d60b3a244df6982187aa0c7d886cc740ead 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -580,7 +580,7 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp)
       GLYPH_FOLLOW_ALIASES (tbase, tlen, g);
       cf = (cmpcharp ? cmpcharp->face_work : FAST_GLYPH_FACE (g));
       ch = FAST_GLYPH_CHAR (g);
-      if (x_display_unibyte_char_with_fontset
+      if (unibyte_display_via_language_environment
          && SINGLE_BYTE_CHAR_P (ch)
          && ch >= 160)
        ch = unibyte_char_to_multibyte (ch);
@@ -621,7 +621,7 @@ dumpglyphs (f, left, top, gp, n, hl, just_foreground, cmpcharp)
          g = *gp;
          GLYPH_FOLLOW_ALIASES (tbase, tlen, g);
          ch = FAST_GLYPH_CHAR (g);
-         if (x_display_unibyte_char_with_fontset
+         if (unibyte_display_via_language_environment
              && SINGLE_BYTE_CHAR_P (ch)
              && ch >= 160)
            ch = unibyte_char_to_multibyte (ch);

diff --git a/src/xterm.h b/src/xterm.h
index c2d65410ce615fbb0796a2fee594e31dd5d6e9c6..b6803aa3cae36ce809428a25c8fda6651051a11f 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -312,7 +312,7 @@ extern Lisp_Object x_display_name_list;
 extern Lisp_Object Vx_pixel_size_width_font_regexp;
 
 /* A flag to control how to display unibyte 8-bit character.  */
-extern int x_display_unibyte_char_with_fontset;
+extern int unibyte_display_via_language_environment;
 
 extern struct x_display_info *x_display_info_for_display ();
 extern struct x_display_info *x_display_info_for_name ();