From: Kenichi Handa <handa@m17n.org>
Date: Tue, 27 Aug 2002 00:59:55 +0000 (+0000)
Subject: (get_next_display_element): In unibyte case, don't use
X-Git-Tag: ttn-vms-21-2-B4~13555
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa831cf8656015853865025adfd56726462b6cce;p=emacs.git

(get_next_display_element): In unibyte case, don't use
octal form for such eight-bit characters that can be converted to
multibyte char.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6387d6d341f..21fbdaca0d9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4258,14 +4258,22 @@ get_next_display_element (it)
 	     the translation.  This could easily be changed but I
 	     don't believe that it is worth doing.
 
-	     Non-printable multibyte characters are also translated
-	     octal form.  */
-	  else if ((it->c < ' '
+	     If it->multibyte_p is nonzero, eight-bit characters and
+	     non-printable multibyte characters are also translated to
+	     octal form.
+
+	     If it->multibyte_p is zero, eight-bit characters that
+	     don't have corresponding multibyte char code are also
+	     translated to octal form.  */
+	  else if (((it->c < ' ' || it->c == 127)
 		    && (it->area != TEXT_AREA
 			|| (it->c != '\n' && it->c != '\t')))
-		   || (it->c >= 127
-		       && it->len == 1)
-		   || !CHAR_PRINTABLE_P (it->c))
+		   || (it->multibyte_p
+		       ? ((it->c >= 127
+			   && it->len == 1)
+			  || !CHAR_PRINTABLE_P (it->c))
+		       : (it->c >= 128
+			  && 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 '^'