diff options
| author | Karoly Lorentey <[email protected]> | 2007-04-22 12:12:29 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2007-04-22 12:12:29 +0000 |
| commit | e18c709364b095ea0be8ecabe458ac9a642a252f (patch) | |
| tree | efe814a842f932f387b3947c572bf43a548d17ef /src/fileio.c | |
| parent | 81088e260b086fe28f36964f32b6338210ec6fd8 (diff) | |
| parent | 9f25e707aaad5ed14a9448e9c5d345ff0bdbc5a7 (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-660
Update from CVS
* [email protected]/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-662
Update from CVS
* [email protected]/emacs--devo--0--patch-663
Update from CVS
* [email protected]/emacs--devo--0--patch-664
Update from CVS
* [email protected]/emacs--devo--0--patch-665
Update from CVS
* [email protected]/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* [email protected]/emacs--devo--0--patch-667
Update from CVS
* [email protected]/emacs--devo--0--patch-668
Update from CVS
* [email protected]/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-670
Update from CVS
* [email protected]/emacs--devo--0--patch-671
Update from CVS
* [email protected]/emacs--devo--0--patch-672
Update from CVS
* [email protected]/emacs--devo--0--patch-673
Update from CVS
* [email protected]/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-600
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 074a7a0527..7cb45a72db 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5806,7 +5806,11 @@ do_auto_save_unwind (arg) /* used as unwind-protect function */ FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; auto_saving = 0; if (stream != NULL) - fclose (stream); + { + BLOCK_INPUT; + fclose (stream); + UNBLOCK_INPUT; + } return Qnil; } @@ -5936,6 +5940,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) if (STRINGP (b->auto_save_file_name) && stream != NULL && do_handled_files == 0) { + BLOCK_INPUT; if (!NILP (b->filename)) { fwrite (SDATA (b->filename), 1, @@ -5945,6 +5950,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) fwrite (SDATA (b->auto_save_file_name), 1, SBYTES (b->auto_save_file_name), stream); putc ('\n', stream); + UNBLOCK_INPUT; } if (!NILP (current_only) |