diff options
| author | Joakim Verona | 2014-06-23 09:41:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2014-06-23 09:41:17 +0200 |
| commit | c4916d541b6f91e80283b473c5191651c719228a (patch) | |
| tree | b8f4b0850983aaefc598a5db3f51e9fff9e457af /src/buffer.c | |
| parent | ce8171797dafbde765170b79e5f154afc4872e86 (diff) | |
| parent | 814200c2675928b79ee0e023c0fc939ef0da8317 (diff) | |
| download | emacs-c4916d541b6f91e80283b473c5191651c719228a.tar.gz emacs-c4916d541b6f91e80283b473c5191651c719228a.zip | |
manual upstream merge
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index bc0a796ea71..541fa832297 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -2538,7 +2538,7 @@ current buffer is cleared. */) | |||
| 2538 | p = GAP_END_ADDR; | 2538 | p = GAP_END_ADDR; |
| 2539 | stop = Z; | 2539 | stop = Z; |
| 2540 | } | 2540 | } |
| 2541 | if (ASCII_BYTE_P (*p)) | 2541 | if (ASCII_CHAR_P (*p)) |
| 2542 | p++, pos++; | 2542 | p++, pos++; |
| 2543 | else if (CHAR_BYTE8_HEAD_P (*p)) | 2543 | else if (CHAR_BYTE8_HEAD_P (*p)) |
| 2544 | { | 2544 | { |
| @@ -2610,7 +2610,7 @@ current buffer is cleared. */) | |||
| 2610 | stop = Z; | 2610 | stop = Z; |
| 2611 | } | 2611 | } |
| 2612 | 2612 | ||
| 2613 | if (ASCII_BYTE_P (*p)) | 2613 | if (ASCII_CHAR_P (*p)) |
| 2614 | p++, pos++; | 2614 | p++, pos++; |
| 2615 | else if (EQ (flag, Qt) | 2615 | else if (EQ (flag, Qt) |
| 2616 | && ! CHAR_BYTE8_HEAD_P (*p) | 2616 | && ! CHAR_BYTE8_HEAD_P (*p) |