From 1d92afcdb4f94e02948d6914923221aa025dd00b Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Sun, 20 Feb 2000 21:54:26 +0000 Subject: (Finsert_file_contents): Unbind the binding of standard-output done by temp_output_buffer_setup. --- src/ChangeLog | 5 ++++- src/fileio.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index e7ba55229b..01a86c89df 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,7 @@ -2000-02-19 Gerd Moellmann +2000-02-20 Gerd Moellmann + + * fileio.c (Finsert_file_contents): Unbind the binding of + standard-output done by temp_output_buffer_setup. * eval.c (funcall_lambda): Don't bind Qmocklisp_arguments unless Vmocklisp_arguments is nil. Inline Fcar and Fcdr. diff --git a/src/fileio.c b/src/fileio.c index d693369ddf..1d3da63ba5 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3543,9 +3543,15 @@ actually used.") else if (nread > 0) { struct buffer *prev = current_buffer; + int count1; record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); + + /* The call to temp_output_buffer_setup binds + standard-output. */ + count1 = specpdl_ptr - specpdl; temp_output_buffer_setup (" *code-converting-work*"); + set_buffer_internal (XBUFFER (Vstandard_output)); current_buffer->enable_multibyte_characters = Qnil; insert_1_both (read_buf, nread, nread, 0, 0, 0); @@ -3553,6 +3559,10 @@ actually used.") val = call2 (Vset_auto_coding_function, filename, make_number (nread)); set_buffer_internal (prev); + + /* Remove the binding for standard-output. */ + unbind_to (count1, Qnil); + /* Discard the unwind protect for recovering the current buffer. */ specpdl_ptr--; -- cgit v1.2.3