diff options
| author | Gregory Heytings | 2022-07-19 23:30:17 +0200 |
|---|---|---|
| committer | Gregory Heytings | 2022-07-19 23:30:17 +0200 |
| commit | c6bee1707523549ce02eadb506f54e9089ea1a3f (patch) | |
| tree | 56ca9b74d59eb3c4053d1a700cb867d05610bb39 /src/buffer.c | |
| parent | 9a894206f6990eb5e0edc464dae02700a33d2348 (diff) | |
| download | emacs-c6bee1707523549ce02eadb506f54e9089ea1a3f.tar.gz emacs-c6bee1707523549ce02eadb506f54e9089ea1a3f.zip | |
Revert commits 1ff69cc744 and 9a894206f6.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index 9a463363b93..a777668e44b 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -599,7 +599,6 @@ even if it is dead. The return value is never nil. */) | |||
| 599 | BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; | 599 | BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1; |
| 600 | BUF_END_UNCHANGED (b) = 0; | 600 | BUF_END_UNCHANGED (b) = 0; |
| 601 | BUF_BEG_UNCHANGED (b) = 0; | 601 | BUF_BEG_UNCHANGED (b) = 0; |
| 602 | BUF_UNCHANGED_SIZE (b) = 0; | ||
| 603 | *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ | 602 | *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ |
| 604 | b->text->inhibit_shrinking = false; | 603 | b->text->inhibit_shrinking = false; |
| 605 | b->text->redisplay = false; | 604 | b->text->redisplay = false; |
| @@ -2478,11 +2477,6 @@ results, see Info node `(elisp)Swapping Text'. */) | |||
| 2478 | other_buffer->text->beg_unchanged = other_buffer->text->gpt; | 2477 | other_buffer->text->beg_unchanged = other_buffer->text->gpt; |
| 2479 | other_buffer->text->end_unchanged = other_buffer->text->gpt; | 2478 | other_buffer->text->end_unchanged = other_buffer->text->gpt; |
| 2480 | { | 2479 | { |
| 2481 | ptrdiff_t tmp = current_buffer->text->unchanged_size; | ||
| 2482 | current_buffer->text->unchanged_size = other_buffer->text->unchanged_size; | ||
| 2483 | other_buffer->text->unchanged_size = tmp; | ||
| 2484 | } | ||
| 2485 | { | ||
| 2486 | struct Lisp_Marker *m; | 2480 | struct Lisp_Marker *m; |
| 2487 | for (m = BUF_MARKERS (current_buffer); m; m = m->next) | 2481 | for (m = BUF_MARKERS (current_buffer); m; m = m->next) |
| 2488 | if (m->buffer == other_buffer) | 2482 | if (m->buffer == other_buffer) |