1 files changed, 3 insertions, 1 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 4d590248e24..0c6e57d45be 100644
--- 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
             {