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

dcfb9bc4 · Kenichi Handa · 4aa2c3b2 · dcfb9bc4 · dcfb9bc4
Commit dcfb9bc4 authored Mar 02, 2010 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/buffer.c src/buffer.c +3 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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)

--- 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
 	    {