[Emacs-diffs] master 998e197: More fixes to prevent crashes on C-g

[Eli Zaretskii]

branch: master
commit 998e1976acc554a35cb7064b7fc7f3b323a30fe6
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    More fixes to prevent crashes on C-g
    
    * src/fns.c (Fassq, Frassq, Fplist_put): Reset immediate_quit
    before returning, to avoid crashes in quit.  (Bug#25566)
---
 src/fns.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fns.c b/src/fns.c
index 5769eac..0d93f82 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -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))