Mercurial > emacs
comparison src/buffer.c @ 107638:772da445ced7
Merge from mainline.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 06 Mar 2010 05:16:27 -0500 |
| parents | c5f9e4613394 cdeadbfdda61 |
| children | 912a8c0c9a8a |
comparison
equal
deleted
inserted
replaced
| 107637:59df2de8b31d | 107638:772da445ced7 |
|---|---|
| 2497 stop = Z; | 2497 stop = Z; |
| 2498 } | 2498 } |
| 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 { |
| 2506 unsigned char tmp[MAX_MULTIBYTE_LENGTH]; | 2508 unsigned char tmp[MAX_MULTIBYTE_LENGTH]; |
| 2507 int c; | 2509 int c; |