[Emacs-diffs] Changes to emacs/src/fileio.c

[Kenichi Handa]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.442 emacs/src/fileio.c:1.443
*** emacs/src/fileio.c:1.442    Sat Mar  9 05:20:18 2002
--- emacs/src/fileio.c  Sat Apr 13 13:49:28 2002
***************
*** 3777,3801 ****
              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);
                  TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
                  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.  */
--- 3777,3806 ----
              else if (nread > 0)
                {
                  struct buffer *prev = current_buffer;
!                 Lisp_Object buffer;
!                 struct buffer *buf;
  
                  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
  
!                 buffer = Fget_buffer_create (build_string (" 
*code-converting-work*"));
!                 buf = XBUFFER (buffer);
! 
!                 buf->directory = current_buffer->directory;
!                 buf->read_only = Qnil;
!                 buf->filename = Qnil;
!                 buf->undo_list = Qt;
!                 buf->overlays_before = Qnil;
!                 buf->overlays_after = Qnil;
                  
!                 set_buffer_internal (buf);
!                 Ferase_buffer ();
!                 buf->enable_multibyte_characters = Qnil;
! 
                  insert_1_both (read_buf, nread, nread, 0, 0, 0);
                  TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
                  val = call2 (Vset_auto_coding_function,
                               filename, make_number (nread));
                  set_buffer_internal (prev);
                  
                  /* Discard the unwind protect for recovering the
                       current buffer.  */