Re: current CVS redisplay is fucked

[Miles Bader <miles@lsi.nec.co.jp>]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

The problem seems to be this change from yesterday:

   2002-08-27  Kenichi Handa  <handa@etl.go.jp>

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

I reverted the attached patch in my local tree, and the problem is gone.

-Miles



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: xdisp.c patch that causes display problems --]
[-- Type: text/x-patch, Size: 1370 bytes --]

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- xdisp.c	22 Aug 2002 16:52:56 -0000	1.777
+++ xdisp.c	27 Aug 2002 00:59:55 -0000	1.778
@@ -4258,14 +4258,22 @@
 	     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 '^'

[-- Attachment #3: Type: text/plain, Size: 40 bytes --]



-- 
We live, as we dream -- alone....