1 files changed, 8 insertions, 0 deletions

diff --git a/src/fileio.c b/src/fileio.c
index fe4deb1fd32..04962eee1df 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3004,6 +3004,12 @@ Non-nil second argument means save only current buffer.")
   char *omessage = echo_area_glyphs;
   extern int minibuf_level;
   int do_handled_files;
+  Lisp_Object oquit;
+
+  /* Ordinarily don't quit within this function,
+     but don't make it impossible to quit (in case we get hung in I/O).  */
+  oquit = Vquit_flag;
+  Vquit_flag = Qnil;
 
   /* No GCPRO needed, because (when it matters) all Lisp_Object variables
      point to non-strings reached from Vbuffer_alist.  */
@@ -3078,6 +3084,8 @@ Non-nil second argument means save only current buffer.")
   if (auto_saved && NILP (no_message))
     message1 (omessage ? omessage : "Auto-saving...done");
 
+  Vquit_flag = oquit;
+
   auto_saving = 0;
   return Qnil;
 }