summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-01-30 19:26:02 +0200
committerEli Zaretskii <eliz@gnu.org>2017-01-30 19:26:02 +0200
commit998e1976acc554a35cb7064b7fc7f3b323a30fe6 (patch)
treeede52f2cd3ef97dc1c37f7810ef7f5605cf8b663
parentab96c8509736a7ed622916ad2749ff356e520d02 (diff)
downloademacs-998e1976acc554a35cb7064b7fc7f3b323a30fe6.tar.gz
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)
-rw-r--r--src/fns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fns.c b/src/fns.c
index 5769eac9987..0d93f824748 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))