diff options
| author | Eli Zaretskii | 2010-03-06 05:16:27 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-03-06 05:16:27 -0500 |
| commit | 9dbadf5f1a700c5790837738410c06b481cd2222 (patch) | |
| tree | e1458f8f2aef541b98c7df4ea2d780c5011d9fe9 /src/buffer.c | |
| parent | d23cd5eeb2993e55943d250ea8c2015da5b06a24 (diff) | |
| parent | 4c83ed3d48c69e12c91a2ada2d00f4f74be2a42d (diff) | |
| download | emacs-9dbadf5f1a700c5790837738410c06b481cd2222.tar.gz emacs-9dbadf5f1a700c5790837738410c06b481cd2222.zip | |
Merge from mainline.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
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. */) | |||
| 2499 | 2499 | ||
| 2500 | if (ASCII_BYTE_P (*p)) | 2500 | if (ASCII_BYTE_P (*p)) |
| 2501 | p++, pos++; | 2501 | p++, pos++; |
| 2502 | else if (EQ (flag, Qt) && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0) | 2502 | else if (EQ (flag, Qt) |
| 2503 | && ! CHAR_BYTE8_HEAD_P (*p) | ||
| 2504 | && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0) | ||
| 2503 | p += bytes, pos += bytes; | 2505 | p += bytes, pos += bytes; |
| 2504 | else | 2506 | else |
| 2505 | { | 2507 | { |