[Emacs-diffs] /srv/bzr/emacs/trunk r99595: buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes.

[Kenichi Handa]

------------------------------------------------------------
revno: 99595 [merge]
committer: Kenichi Handa  <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-02 10:35:00 +0900
message:
  buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of 
raw-bytes.
modified:
  src/ChangeLog
  src/buffer.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-02-28 14:19:31 +0000
+++ b/src/ChangeLog     2010-03-02 01:30:52 +0000
@@ -1,3 +1,8 @@
+2010-03-02  Kenichi Handa  <address@hidden>
+
+       * buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte
+       form of raw-bytes.
+
 2010-02-28  Chong Yidong  <address@hidden>
 
        * charset.c (load_charset_map_from_file)

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2010-01-13 04:33:42 +0000
+++ b/src/buffer.c      2010-03-02 01:30:52 +0000
@@ -2497,7 +2497,9 @@
 
          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
            {