2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a513d0194e..1cc8be73541 100644
--- 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 b7a24a4364b..1c479aee4e8 100644
--- 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 '^'