diff options
| author | Eli Zaretskii | 2020-03-30 16:57:43 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-03-30 16:57:43 +0300 |
| commit | ced7852046469b8248718d5c95c64c0cd4ddf417 (patch) | |
| tree | dc93257ef56938feff530f542d8fbad1eb6b6178 /src | |
| parent | 3273e2ace788a58bef77cef936021d151815ea94 (diff) | |
| download | emacs-ced7852046469b8248718d5c95c64c0cd4ddf417.tar.gz emacs-ced7852046469b8248718d5c95c64c0cd4ddf417.zip | |
Avoid assertion violation at startup in pdumped Emacs
* src/buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Remove the
assertion that ensured all buffers in pdumped Emacs have non-NULL
pointer to buffer text. That was false when Emacs was pdumped
with killed buffer(s) in the all_buffers linked list. See
https://lists.gnu.org/archive/html/emacs-devel/2020-03/msg00800.html
for more details.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/buffer.c b/src/buffer.c index 70598a7a22a..4e121ca4cab 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5387,17 +5387,6 @@ init_buffer (void) | |||
| 5387 | enlarge_buffer_text (b, 0); | 5387 | enlarge_buffer_text (b, 0); |
| 5388 | } | 5388 | } |
| 5389 | } | 5389 | } |
| 5390 | else | ||
| 5391 | { | ||
| 5392 | struct buffer *b; | ||
| 5393 | |||
| 5394 | /* Only buffers with allocated buffer text should be present at | ||
| 5395 | this point in temacs. */ | ||
| 5396 | FOR_EACH_BUFFER (b) | ||
| 5397 | { | ||
| 5398 | eassert (b->text->beg != NULL); | ||
| 5399 | } | ||
| 5400 | } | ||
| 5401 | #endif /* USE_MMAP_FOR_BUFFERS */ | 5390 | #endif /* USE_MMAP_FOR_BUFFERS */ |
| 5402 | 5391 | ||
| 5403 | AUTO_STRING (scratch, "*scratch*"); | 5392 | AUTO_STRING (scratch, "*scratch*"); |