(Fplist_get): Don't QUIT is interrupt_input_blocked.

1 files changed, 6 insertions, 1 deletions

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;
     }