(get_next_display_element): If

unibyte_display_via_language_environment is zero, display 8-bit
chars in octal in unibyte buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a513d0194ef8dc8077c3493822b4718b5a31414..1cc8be7354193a03cb26d7963fbe4505f37c6275 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-12  Kenichi Handa  <handa@m17n.org>
+
+       * xdisp.c (get_next_display_element): If
+       unibyte_display_via_language_environment is zero, display 8-bit
+       chars in octal in unibyte buffer.
+
 2004-10-12  Kim F. Storm  <storm@cua.dk>
 
        * doc.c (Fsubstitute_command_keys): Ignore remappings unless there

diff --git a/src/xdisp.c b/src/xdisp.c
index b7a24a4364b5076c0ba96bf1dd16940b5ca6cf16..1c479aee4e8f61944cb0074ffeea2cf664e85d42 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4897,7 +4897,8 @@ get_next_display_element (it)
                           && it->len == 1)
                          || !CHAR_PRINTABLE_P (it->c))
                       : (it->c >= 127
-                         && it->c == unibyte_char_to_multibyte (it->c))))
+                         && (!unibyte_display_via_language_environment
+                             || it->c == unibyte_char_to_multibyte (it->c)))))
            {
              /* IT->c is a control character which must be displayed
                 either as '\003' or as `^C' where the '\\' and '^'