comparison src/fileio.c @ 89440:06b495fd070a

(kill_workbuf_unwind): New function. (Finsert_file_contents): On replacing, call make_conversion_work_buffer with correct args, and call record_unwind_protect with the first arg kill_workbuf_unwind.

89439:bc52ad30b028

{
  Fgoto_char (location);
  Fset_marker (location, Qnil, Qnil);
  return Qnil;
}

Lisp_Object Qexpand_file_name;
Lisp_Object Qsubstitute_in_file_name;
Lisp_Object Qdirectory_file_name;
Lisp_Object Qfile_name_directory;

      int overlap;
      int bufpos;
      unsigned char *decoded;
      int temp;
      int this_count = BINDING_STACK_SIZE ();
      Lisp_Object conversion_buffer
	= make_conversion_work_buffer (! NILP (current_buffer
					       ->enable_multibyte_characters));
      struct gcpro1;

      record_unwind_protect (code_conversion_restore, save_excursion_save ());

      /* First read the whole file, performing code conversion into
	 CONVERSION_BUFFER.  */

      if (lseek (fd, XINT (beg), 0) < 0)

89440:06b495fd070a

{
  Fgoto_char (location);
  Fset_marker (location, Qnil, Qnil);
  return Qnil;
}

/* Kill the working buffer for code conversion.  */

static Lisp_Object
kill_workbuf_unwind (workbuf)
     Lisp_Object workbuf;
{
  if (! NILP (workbuf) && ! NILP (Fbuffer_live_p (workbuf)))
    Fkill_buffer (workbuf);
  return Qnil;
}


Lisp_Object Qexpand_file_name;
Lisp_Object Qsubstitute_in_file_name;
Lisp_Object Qdirectory_file_name;
Lisp_Object Qfile_name_directory;

      int overlap;
      int bufpos;
      unsigned char *decoded;
      int temp;
      int this_count = BINDING_STACK_SIZE ();
      int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
      Lisp_Object conversion_buffer
	= make_conversion_work_buffer (-1, multibyte);
      struct gcpro1;

      record_unwind_protect (kill_workbuf_unwind, conversion_buffer);

      /* First read the whole file, performing code conversion into
	 CONVERSION_BUFFER.  */

      if (lseek (fd, XINT (beg), 0) < 0)