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

[Kenichi Handa]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.529 emacs/src/fileio.c:1.530
*** emacs/src/fileio.c:1.529    Fri Mar  4 21:57:21 2005
--- emacs/src/fileio.c  Fri Mar 11 11:59:42 2005
***************
*** 4503,4514 ****
             this way, we can run Lisp program safely before decoding
             the inserted text.  */
          Lisp_Object unwind_data;
!             int count = SPECPDL_INDEX ();
  
          unwind_data = Fcons (current_buffer->enable_multibyte_characters,
                               Fcons (current_buffer->undo_list,
                                      Fcurrent_buffer ()));
!             current_buffer->enable_multibyte_characters = Qnil;
          current_buffer->undo_list = Qt;
          record_unwind_protect (decide_coding_unwind, unwind_data);
  
--- 4503,4514 ----
             this way, we can run Lisp program safely before decoding
             the inserted text.  */
          Lisp_Object unwind_data;
!         int count = SPECPDL_INDEX ();
  
          unwind_data = Fcons (current_buffer->enable_multibyte_characters,
                               Fcons (current_buffer->undo_list,
                                      Fcurrent_buffer ()));
!         current_buffer->enable_multibyte_characters = Qnil;
          current_buffer->undo_list = Qt;
          record_unwind_protect (decide_coding_unwind, unwind_data);
  
***************
*** 4530,4536 ****
              if (CONSP (coding_systems))
                val = XCAR (coding_systems);
            }
- 
          unbind_to (count, Qnil);
          inserted = Z_BYTE - BEG_BYTE;
        }
--- 4530,4535 ----
***************
*** 4541,4547 ****
         on some system.  */
        {
        struct coding_system temp_coding;
!       setup_coding_system (val, &temp_coding);
        bcopy (&temp_coding, &coding, sizeof coding);
        }
        /* Ensure we set Vlast_coding_system_used.  */
--- 4540,4546 ----
         on some system.  */
        {
        struct coding_system temp_coding;
!       setup_coding_system (Fcheck_coding_system (val), &temp_coding);
        bcopy (&temp_coding, &coding, sizeof coding);
        }
        /* Ensure we set Vlast_coding_system_used.  */