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

diff --git a/src/ChangeLog b/src/ChangeLog
index f0a620b7b995c985f044edbfabf88d2f1edf0480..cb9b2d85d11cedb02c9c331235366acc6fc6dc82 100644 (file)
--- 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 1880581c0a11f7988cffde8dc8e4e779937815b2..a0acad309af557c58fd40b49c55ae9d32e0612d4 100644 (file)
--- 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
            {