comparison src/coding.c @ 20616:b382c9ca6c39

(code_convert_string): Maybe use make_unibyte_string.

20615:ddb1eec37783

				   &consumed)
		  : decode_coding (coding, begp, buf, shrunk_len_byte, buflen,
				   &consumed));

      TEMP_SET_PT_BOTH (shrunk_beg, shrunk_beg_byte);
      insert (buf, produced);
      del_range_byte (PT_BYTE, PT_BYTE + shrunk_len_byte, 1);

      if (opoint >= end)
	{
	  opoint += ZV - zv_before;

    {
      /* Since we have to call Lisp functions which assume target text
         is in a buffer, after setting a temporary buffer, call
         code_convert_region.  */
      int count = specpdl_ptr - specpdl;
      int len = XSTRING (str)->size;
      Lisp_Object result;
      struct buffer *old = current_buffer;

      record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
      temp_output_buffer_setup (" *code-converting-work*");
      set_buffer_internal (XBUFFER (Vstandard_output));
      insert_from_string (str, 0, len, 0);
      code_convert_region (make_number (BEGV), make_number (ZV),
			   coding, encodep);
      result = make_buffer_string (BEGV, ZV, 0);
      set_buffer_internal (old);
      return unbind_to (count, result);
    }

  /* We may be able to shrink the conversion region.  */
  begp = XSTRING (str)->data;
  endp = begp + XSTRING (str)->size;
  shrink_conversion_area (&begp, &endp, coding, encodep);

  if (begp == endp)
    /* We need no conversion.  */
    return (NILP (nocopy) ? Fcopy_sequence (str) : str);

  head_skip = begp - XSTRING (str)->data;
  tail_skip = XSTRING (str)->size - head_skip - (endp - begp);

  GCPRO1 (str);

  if (encodep)
    len = encoding_buffer_size (coding, endp - begp);

	 buf + head_skip + produced,
	 tail_skip);

  UNGCPRO;

  return make_string (buf, head_skip + produced + tail_skip);
}

DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region,
       3, 3, "r\nzCoding system: ",

20616:b382c9ca6c39

				   &consumed)
		  : decode_coding (coding, begp, buf, shrunk_len_byte, buflen,
				   &consumed));

      TEMP_SET_PT_BOTH (shrunk_beg, shrunk_beg_byte);

      if (encodep)
	/* If we just encoded, treat the result as single-byte.  */
	insert_1_both (buf, produced, produced, 0, 1, 0);
      else
	insert (buf, produced);

      del_range_byte (PT_BYTE, PT_BYTE + shrunk_len_byte, 1);

      if (opoint >= end)
	{
	  opoint += ZV - zv_before;

    {
      /* Since we have to call Lisp functions which assume target text
         is in a buffer, after setting a temporary buffer, call
         code_convert_region.  */
      int count = specpdl_ptr - specpdl;
      int len = XSTRING (str)->size_byte;
      Lisp_Object result;
      struct buffer *old = current_buffer;

      record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
      temp_output_buffer_setup (" *code-converting-work*");
      set_buffer_internal (XBUFFER (Vstandard_output));
      insert_from_string (str, 0, 0, XSTRING (str)->size, len, 0);
      code_convert_region (make_number (BEGV), make_number (ZV),
			   coding, encodep);
      result = make_buffer_string (BEGV, ZV, 0);
      set_buffer_internal (old);
      return unbind_to (count, result);
    }

  /* We may be able to shrink the conversion region.  */
  begp = XSTRING (str)->data;
  endp = begp + XSTRING (str)->size_byte;
  shrink_conversion_area (&begp, &endp, coding, encodep);

  if (begp == endp)
    /* We need no conversion.  */
    return (NILP (nocopy) ? Fcopy_sequence (str) : str);

  /* We assume that head_skip and tail_skip count single-byte characters.  */
  head_skip = begp - XSTRING (str)->data;
  tail_skip = XSTRING (str)->size_byte - head_skip - (endp - begp);

  GCPRO1 (str);

  if (encodep)
    len = encoding_buffer_size (coding, endp - begp);

	 buf + head_skip + produced,
	 tail_skip);

  UNGCPRO;

  if (encodep)
    /* When encoding, the result is all single-byte characters.  */
    return make_unibyte_string (buf, head_skip + produced + tail_skip);

  /* When decoding, count properly the number of chars in the string.  */
  return make_string (buf, head_skip + produced + tail_skip);
}

DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region,
       3, 3, "r\nzCoding system: ",