comparison src/fileio.c @ 89667:20a59c5d1d55

(kill_workbuf_unwind): Delete this function. (Finsert_file_contents): Adjust the call of detect_coding_system. Get conversion_buffer by code_conversion_save. Use the macor CODING_MAY_REQUIRE_DECODING. After decoding, update coding_system.

89666:7d38a63951c0

  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;

	  else if (nread == 0)
	    break;

	  if (CODING_REQUIRE_DETECTION (&coding))
	    {
	      coding_system = detect_coding_system (buffer, nread, 1, 0,
						    coding_system);
	      setup_coding_system (coding_system, &coding);
	    }

	  if (CODING_REQUIRE_DECODING (&coding))

      int bufpos;
      unsigned char *decoded;
      int temp;
      int this_count = SPECPDL_INDEX ();
      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)

      /* When we visit a file by raw-text, we change the buffer to
	 unibyte.  If we have not yet decided how to decode a text,
	 decide it at first by detecting the file's encoding.  */
      if (CODING_REQUIRE_DETECTION (&coding))
	{
	  coding_system = detect_coding_system (PT_ADDR, inserted, 1, 0,
						coding_system);
	  setup_coding_system (coding_system, &coding);
	}

      if (CODING_FOR_UNIBYTE (&coding)
	  /* Can't do this if part of the buffer might be preserved.  */

	   unibyte. */
	current_buffer->enable_multibyte_characters = Qnil;
    }

  coding.dst_multibyte = ! NILP (current_buffer->enable_multibyte_characters);
  if ((CODING_REQUIRE_DETECTION (&coding)
       || CODING_REQUIRE_DECODING (&coding))
      && (inserted > 0 || CODING_REQUIRE_FLUSHING (&coding)))
    {
      move_gap_both (PT, PT_BYTE);
      GAP_SIZE += inserted;
      ZV_BYTE -= inserted;
      Z_BYTE -= inserted;
      ZV -= inserted;
      Z -= inserted;
      decode_coding_gap (&coding, inserted, inserted);
      inserted = coding.produced_char;
    }
  else if (inserted > 0)
    adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
			 inserted);

89667:20a59c5d1d55

  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;

	  else if (nread == 0)
	    break;

	  if (CODING_REQUIRE_DETECTION (&coding))
	    {
	      coding_system = detect_coding_system (buffer, nread, nread, 1, 0,
						    coding_system);
	      setup_coding_system (coding_system, &coding);
	    }

	  if (CODING_REQUIRE_DECODING (&coding))

      int bufpos;
      unsigned char *decoded;
      int temp;
      int this_count = SPECPDL_INDEX ();
      int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
      Lisp_Object conversion_buffer;

      conversion_buffer = code_conversion_save (1, multibyte);

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

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

      /* When we visit a file by raw-text, we change the buffer to
	 unibyte.  If we have not yet decided how to decode a text,
	 decide it at first by detecting the file's encoding.  */
      if (CODING_REQUIRE_DETECTION (&coding))
	{
	  coding_system = detect_coding_system (PT_ADDR, inserted, inserted,
						1, 0, coding_system);
	  setup_coding_system (coding_system, &coding);
	}

      if (CODING_FOR_UNIBYTE (&coding)
	  /* Can't do this if part of the buffer might be preserved.  */

	   unibyte. */
	current_buffer->enable_multibyte_characters = Qnil;
    }

  coding.dst_multibyte = ! NILP (current_buffer->enable_multibyte_characters);
  if (CODING_MAY_REQUIRE_DECODING (&coding)
      && (inserted > 0 || CODING_REQUIRE_FLUSHING (&coding)))
    {
      move_gap_both (PT, PT_BYTE);
      GAP_SIZE += inserted;
      ZV_BYTE -= inserted;
      Z_BYTE -= inserted;
      ZV -= inserted;
      Z -= inserted;
      decode_coding_gap (&coding, inserted, inserted);
      inserted = coding.produced_char;
      coding_system = CODING_ID_NAME (coding.id);
    }
  else if (inserted > 0)
    adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
			 inserted);