2 files changed, 16 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b651ae47589..6253b258c2f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,13 @@
+2004-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * sysdep.c (emacs_write): Don't use QUIT.
+
 2004-11-29  Kenichi Handa  <handa@m17n.org>
 
         * buffer.c (init_buffer): Set current_buffer->directory to a
         multibyte string made by string_to_multibyte.
 
-        * emacs.c (init_cmdargs): Set unibyte strings in
-        Vcommand_line_args.
+        * emacs.c (init_cmdargs): Set unibyte strings in Vcommand_line_args.
 
 2004-11-27  Andreas Schwab  <schwab@suse.de>
 
@@ -13,8 +16,8 @@
         * s/gnu-linux.h: Enable no-op gcpros on ia64.
         (GC_MARK_SECONDARY_STACK) [__ia64__]: Define.
 
-        * filelock.c (lock_file_1): Call get_boot_time early.  Increase
-        buffer size.
+        * filelock.c (lock_file_1): Call get_boot_time early.
+        Increase buffer size.
 
 2004-11-27  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 8ce49cd2e97..6284774d092 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3285,7 +3285,15 @@ emacs_write (fildes, buf, nbyte)
       if (rtnval == -1)
         {
           if (errno == EINTR)
-            { QUIT; continue; }
+            {
+#ifdef SYNC_INPUT
+              /* I originally used `QUIT' but that might causes files to
+                 be truncated if you hit C-g in the middle of it.  --Stef  */
+              if (interrupt_input_pending)
+                handle_async_input ();
+#endif
+              continue;
+            }
           else
             return (bytes_written ? bytes_written : -1);
         }