aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2004-11-29 14:39:09 +0000
committerStefan Monnier2004-11-29 14:39:09 +0000
commit77220eeb1e9a2b20c648de7cc36df00746c85576 (patch)
tree49236aa879307e7cfc7272971734cf0924ce3262 /src
parenta778cf63fc862fc816c5c6d267d53f44ba7820ea (diff)
downloademacs-77220eeb1e9a2b20c648de7cc36df00746c85576.tar.gz
emacs-77220eeb1e9a2b20c648de7cc36df00746c85576.zip
(emacs_write): Don't use QUIT.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/sysdep.c10
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 @@
12004-11-29 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * sysdep.c (emacs_write): Don't use QUIT.
4
12004-11-29 Kenichi Handa <handa@m17n.org> 52004-11-29 Kenichi Handa <handa@m17n.org>
2 6
3 * buffer.c (init_buffer): Set current_buffer->directory to a 7 * buffer.c (init_buffer): Set current_buffer->directory to a
4 multibyte string made by string_to_multibyte. 8 multibyte string made by string_to_multibyte.
5 9
6 * emacs.c (init_cmdargs): Set unibyte strings in 10 * emacs.c (init_cmdargs): Set unibyte strings in Vcommand_line_args.
7 Vcommand_line_args.
8 11
92004-11-27 Andreas Schwab <schwab@suse.de> 122004-11-27 Andreas Schwab <schwab@suse.de>
10 13
@@ -13,8 +16,8 @@
13 * s/gnu-linux.h: Enable no-op gcpros on ia64. 16 * s/gnu-linux.h: Enable no-op gcpros on ia64.
14 (GC_MARK_SECONDARY_STACK) [__ia64__]: Define. 17 (GC_MARK_SECONDARY_STACK) [__ia64__]: Define.
15 18
16 * filelock.c (lock_file_1): Call get_boot_time early. Increase 19 * filelock.c (lock_file_1): Call get_boot_time early.
17 buffer size. 20 Increase buffer size.
18 21
192004-11-27 Eli Zaretskii <eliz@gnu.org> 222004-11-27 Eli Zaretskii <eliz@gnu.org>
20 23
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)
3285 if (rtnval == -1) 3285 if (rtnval == -1)
3286 { 3286 {
3287 if (errno == EINTR) 3287 if (errno == EINTR)
3288 { QUIT; continue; } 3288 {
3289#ifdef SYNC_INPUT
3290 /* I originally used `QUIT' but that might causes files to
3291 be truncated if you hit C-g in the middle of it. --Stef */
3292 if (interrupt_input_pending)
3293 handle_async_input ();
3294#endif
3295 continue;
3296 }
3289 else 3297 else
3290 return (bytes_written ? bytes_written : -1); 3298 return (bytes_written ? bytes_written : -1);
3291 } 3299 }