mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-21 03:52:16 -08:00
Code Issues Projects Releases Wiki Activity

Don't let maybe_quit prevent resetting consing_until_gc (bug#43389)

Browse source 
* src/alloc.c (garbage_collect): Postpone `unblock_input` a bit.
* src/window.c (window_parameter): Avoid `maybe_quit`.

cherry picked from commit 420661af07
This commit is contained in:
Stefan Monnier 2021-01-20 09:52:07 -05:00
parent b58fd1eab9
commit 82c228a017
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/alloc.c
View file

@ -5987,11 +5987,13 @@ garbage_collect (void)
gc_in_progress = 0;
unblock_input ();
consing_until_gc = gc_threshold
= consing_threshold (gc_cons_threshold, Vgc_cons_percentage, 0);
/* Unblock *after* re-setting `consing_until_gc` in case `unblock_input`
signals an error (see bug#43389). */
unblock_input ();
if (garbage_collection_messages && NILP (Vmemory_full))
{
if (message_p || minibuf_level > 0)

2
src/window.c
View file

@ -2272,7 +2272,7 @@ return value is a list of elements of the form (PARAMETER . VALUE). */)
Lisp_Object
window_parameter (struct window *w, Lisp_Object parameter)
{
Lisp_Object result = Fassq (parameter, w->window_parameters);
Lisp_Object result = assq_no_quit (parameter, w->window_parameters);
return CDR_SAFE (result);
}