From: Kenichi Handa <handa@m17n.org>
Date: Tue, 2 Mar 2010 01:30:52 +0000 (+0900)
Subject: buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte	form of raw-bytes.
X-Git-Tag: emacs-pretest-23.1.94~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dcfb9bc4a1082ae52ee211dc7050545818c77b38;p=emacs.git

buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte	form of raw-bytes.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f0a620b7b99..cb9b2d85d11 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-02  Kenichi Handa  <handa@m17n.org>
+
+	* buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte
+	form of raw-bytes.
+
 2010-02-28  Chong Yidong  <cyd@stupidchicken.com>
 
 	* charset.c (load_charset_map_from_file)
diff --git a/src/buffer.c b/src/buffer.c
index 1880581c0a1..a0acad309af 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2497,7 +2497,9 @@ current buffer is cleared.  */)
 
 	  if (ASCII_BYTE_P (*p))
 	    p++, pos++;
-	  else if (EQ (flag, Qt) && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0)
+	  else if (EQ (flag, Qt)
+		   && ! CHAR_BYTE8_HEAD_P (*p)
+		   && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0)
 	    p += bytes, pos += bytes;
 	  else
 	    {