aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2004-10-12 07:37:37 +0000
committerKenichi Handa2004-10-12 07:37:37 +0000
commit170b174caeef3b0660938c63f6a0373cc7d5b6c3 (patch)
tree89589ff2af643cf7af482d3338e583dad8ab3dd5 /src
parent5e2e859aeefcc823f0ae7c60091b4c09156a2da0 (diff)
downloademacs-170b174caeef3b0660938c63f6a0373cc7d5b6c3.tar.gz
emacs-170b174caeef3b0660938c63f6a0373cc7d5b6c3.zip
(get_next_display_element): If
unibyte_display_via_language_environment is zero, display 8-bit chars in octal in unibyte buffer.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c3
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 @@
12004-10-12 Kenichi Handa <handa@m17n.org>
2
3 * xdisp.c (get_next_display_element): If
4 unibyte_display_via_language_environment is zero, display 8-bit
5 chars in octal in unibyte buffer.
6
12004-10-12 Kim F. Storm <storm@cua.dk> 72004-10-12 Kim F. Storm <storm@cua.dk>
2 8
3 * doc.c (Fsubstitute_command_keys): Ignore remappings unless there 9 * 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)
4897 && it->len == 1) 4897 && it->len == 1)
4898 || !CHAR_PRINTABLE_P (it->c)) 4898 || !CHAR_PRINTABLE_P (it->c))
4899 : (it->c >= 127 4899 : (it->c >= 127
4900 && it->c == unibyte_char_to_multibyte (it->c)))) 4900 && (!unibyte_display_via_language_environment
4901 || it->c == unibyte_char_to_multibyte (it->c)))))
4901 { 4902 {
4902 /* IT->c is a control character which must be displayed 4903 /* IT->c is a control character which must be displayed
4903 either as '\003' or as `^C' where the '\\' and '^' 4904 either as '\003' or as `^C' where the '\\' and '^'