Merge from mainline.

[gnu-emacs] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 4d590248e246495bd44902cdbf1939254b292651..0c6e57d45be9446ddc85712cbbd295006f8e329f 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2499,7 +2499,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
            {