changeset 60563:ca116ec246d7

(Finsert_file_contents): Call Fcheck_coding_system before calling setup_coding_system so that autoloading of a coding system work.
author Kenichi Handa <handa@m17n.org>
date Fri, 11 Mar 2005 11:59:42 +0000
parents 231ce7de960a
children 8e3e5150cf9e
files src/fileio.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.c	Fri Mar 11 02:04:21 2005 +0000
+++ b/src/fileio.c	Fri Mar 11 11:59:42 2005 +0000
@@ -4503,12 +4503,12 @@
 	     this way, we can run Lisp program safely before decoding
 	     the inserted text.  */
 	  Lisp_Object unwind_data;
-	      int count = SPECPDL_INDEX ();
+	  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->enable_multibyte_characters = Qnil;
 	  current_buffer->undo_list = Qt;
 	  record_unwind_protect (decide_coding_unwind, unwind_data);
 
@@ -4530,7 +4530,6 @@
 	      if (CONSP (coding_systems))
 		val = XCAR (coding_systems);
 	    }
-
 	  unbind_to (count, Qnil);
 	  inserted = Z_BYTE - BEG_BYTE;
 	}
@@ -4541,7 +4540,7 @@
 	 on some system.  */
       {
 	struct coding_system temp_coding;
-	setup_coding_system (val, &temp_coding);
+	setup_coding_system (Fcheck_coding_system (val), &temp_coding);
 	bcopy (&temp_coding, &coding, sizeof coding);
       }
       /* Ensure we set Vlast_coding_system_used.  */