procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More fixes to prevent crashes on C-g

Browse source 
* src/fns.c (Fassq, Frassq, Fplist_put): Reset immediate_quit
before returning, to avoid crashes in quit.  (Bug#25566)
This commit is contained in:
Eli Zaretskii 2017-01-30 19:26:02 +02:00
parent ab96c85097
commit 998e1976ac
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/fns.c
View file

@ -1472,7 +1472,7 @@ Elements of LIST that are not conses are ignored. */)
immediate_quit = false;
return XCAR (tail);
}
immediate_quit = true;
immediate_quit = false;
CHECK_LIST_END (tail, list);
return Qnil;
}
@ -1537,7 +1537,7 @@ The value is actually the first element of LIST whose cdr is KEY. */)
immediate_quit = false;
return XCAR (tail);
}
immediate_quit = true;
immediate_quit = false;
CHECK_LIST_END (tail, list);
return Qnil;
}
@ -2090,7 +2090,7 @@ The PLIST is modified by side effects. */)
prev = tail;
}
immediate_quit = true;
immediate_quit = false;
Lisp_Object newcell
= Fcons (prop, Fcons (val, NILP (prev) ? plist : XCDR (XCDR (prev))));
if (NILP (prev))