summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2010-03-02 10:30:52 +0900
committerKenichi Handa <handa@m17n.org>2010-03-02 10:30:52 +0900
commitdcfb9bc4a1082ae52ee211dc7050545818c77b38 (patch)
tree5ce5d2d9c0033cf2d938acf935d9917764064ebc
parent4aa2c3b2704bcdff6f0f3f93eb919772e8f3eaf5 (diff)
downloademacs-dcfb9bc4a1082ae52ee211dc7050545818c77b38.tar.gz
buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/buffer.c4
2 files changed, 8 insertions, 1 deletions
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
{