aboutsummaryrefslogtreecommitdiffstats
path: root/src/fileio.c
diff options
context:
space:
mode:
authorJoakim Verona2013-01-18 00:03:35 +0100
committerJoakim Verona2013-01-18 00:03:35 +0100
commit9206508b76f73ceeb87c72496d1c40cec83dac21 (patch)
treeeddf1551a4b516ad97a0f2bb1b373c300aa99afd /src/fileio.c
parent6bb5cf7058b9268b87359c49a20acf4ca8730837 (diff)
parent0eb8768885fab926acfae16d2fae8d39a72d8f35 (diff)
downloademacs-9206508b76f73ceeb87c72496d1c40cec83dac21.tar.gz
emacs-9206508b76f73ceeb87c72496d1c40cec83dac21.zip
auto upstream
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 87d945c1e5e..8d711e8e6bf 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4249,7 +4249,7 @@ by calling `format-decode', which see. */)
4249 to be signaled after decoding the text we read. */ 4249 to be signaled after decoding the text we read. */
4250 nbytes = internal_condition_case_1 4250 nbytes = internal_condition_case_1
4251 (read_non_regular, 4251 (read_non_regular,
4252 format_save_value ("iii", (ptrdiff_t) fd, inserted, trytry), 4252 make_save_value ("iii", (ptrdiff_t) fd, inserted, trytry),
4253 Qerror, read_non_regular_quit); 4253 Qerror, read_non_regular_quit);
4254 4254
4255 if (NILP (nbytes)) 4255 if (NILP (nbytes))
@@ -5608,7 +5608,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */)
5608 } 5608 }
5609 5609
5610 record_unwind_protect (do_auto_save_unwind, 5610 record_unwind_protect (do_auto_save_unwind,
5611 make_save_value (stream, 0)); 5611 make_save_pointer (stream));
5612 record_unwind_protect (do_auto_save_unwind_1, 5612 record_unwind_protect (do_auto_save_unwind_1,
5613 make_number (minibuffer_auto_raise)); 5613 make_number (minibuffer_auto_raise));
5614 minibuffer_auto_raise = 0; 5614 minibuffer_auto_raise = 0;