From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 11 Apr 2001 12:58:21 +0000 (+0000)
Subject: (Fplist_get): Don't QUIT is interrupt_input_blocked.
X-Git-Tag: emacs-pretest-21.0.103~234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec2423c930a4afe318ddb9bce06db88e4ba83990;p=emacs.git

(Fplist_get): Don't QUIT is interrupt_input_blocked.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bf6c5522d25..b471a4cb4b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-11  Gerd Moellmann  <gerd@gnu.org>
+
+	* fns.c (Fplist_get): Don't QUIT if interrupt_input_blocked.
+
 2001-04-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* fns.c (Fcompare_strings): Fix return values.
diff --git a/src/fns.c b/src/fns.c
index ceda1cfbf41..c0b8190433e 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1872,7 +1872,11 @@ one of the properties on the list.")
     {
       if (EQ (prop, XCAR (tail)))
 	return XCAR (XCDR (tail));
-      QUIT;
+
+      /* This function can be called asynchronously
+	 (setup_coding_system).  Don't QUIT in that case.  */
+      if (!interrupt_input_blocked)
+	QUIT;
     }
 
   if (!NILP (tail))
@@ -1915,6 +1919,7 @@ The PLIST is modified by side effects.")
 	  Fsetcar (XCDR (tail), val);
 	  return plist;
 	}
+      
       prev = tail;
       QUIT;
     }