diff options
| author | Paul Eggert | 2018-03-29 23:00:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-03-29 23:00:56 -0700 |
| commit | 670f2ffae718046c0fb37313965a51c040ed096f (patch) | |
| tree | ce090026349562fc7d5eee2280ce6b4c7e61e329 /src | |
| parent | 20b858ef13f8f71fae6cbce5cdac31c4dd130600 (diff) | |
| download | emacs-670f2ffae718046c0fb37313965a51c040ed096f.tar.gz emacs-670f2ffae718046c0fb37313965a51c040ed096f.zip | |
Fix CHECK_ALLOCATED_AND_LIVE abort during GC
* src/editfns.c (save_restriction_restore):
Wait for the GC to free the temporary markers (Bug#30931).
Diffstat (limited to 'src')
| -rw-r--r-- | src/editfns.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index 7e35fe87972..727f2d0080c 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3899,9 +3899,10 @@ save_restriction_restore (Lisp_Object data) | |||
| 3899 | 3899 | ||
| 3900 | buf->clip_changed = 1; /* Remember that the narrowing changed. */ | 3900 | buf->clip_changed = 1; /* Remember that the narrowing changed. */ |
| 3901 | } | 3901 | } |
| 3902 | /* These aren't needed anymore, so don't wait for GC. */ | 3902 | /* This isn’t needed anymore, so don’t wait for GC. |
| 3903 | free_marker (XCAR (data)); | 3903 | Do not call free_marker on XCAR (data) or XCDR (data), |
| 3904 | free_marker (XCDR (data)); | 3904 | though, since record_marker_adjustments may have put |
| 3905 | them on the buffer’s undo list (Bug#30931). */ | ||
| 3905 | free_cons (XCONS (data)); | 3906 | free_cons (XCONS (data)); |
| 3906 | } | 3907 | } |
| 3907 | else | 3908 | else |