comparison src/coding.c @ 57285:9093a2e9c3fd

(code_convert_region): Don't skip ASCIIs if there are compositions to encode. Free composition data. (encode_coding_string): Likewise.

57284:5293cc67f41d

	coding_save_composition (coding, from, to, Fcurrent_buffer ());
      else
	coding_allocate_composition_data (coding, from);
    }

  /* Try to skip the heading and tailing ASCIIs.  */
  if (coding->type != coding_type_ccl)
    {
      int from_byte_orig = from_byte, to_byte_orig = to_byte;

      if (from < GPT && GPT < to)
	move_gap_both (from, from_byte);

	  coding->produced = len_byte;
	  coding->produced_char = len;
	  if (!replace)
	    /* We must record and adjust for this new text now.  */
	    adjust_after_insert (from, from_byte_orig, to, to_byte_orig, len);
	  return 0;
	}

      head_skip = from_byte - from_byte_orig;
      tail_skip = to_byte_orig - to_byte;

    }

  if (coding->composing != COMPOSITION_DISABLED)
    coding_save_composition (coding, from, to, str);

  /* Try to skip the heading and tailing ASCIIs.  */
  if (coding->type != coding_type_ccl)
    {
      SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
				1);
      if (from == to_byte)
	return (nocopy ? str : Fcopy_sequence (str));
      shrinked_bytes = from + (SBYTES (str) - to_byte);
    }

  len = encoding_buffer_size (coding, to_byte - from);
  allocate_conversion_buffer (buf, len);

57285:9093a2e9c3fd

	coding_save_composition (coding, from, to, Fcurrent_buffer ());
      else
	coding_allocate_composition_data (coding, from);
    }

  /* Try to skip the heading and tailing ASCIIs.  We can't skip them
     if we must run CCL program or there are compositions to
     encode.  */
  if (coding->type != coding_type_ccl
      && (! coding->cmp_data || coding->cmp_data->used == 0))
    {
      int from_byte_orig = from_byte, to_byte_orig = to_byte;

      if (from < GPT && GPT < to)
	move_gap_both (from, from_byte);

	  coding->produced = len_byte;
	  coding->produced_char = len;
	  if (!replace)
	    /* We must record and adjust for this new text now.  */
	    adjust_after_insert (from, from_byte_orig, to, to_byte_orig, len);
	  coding_free_composition_data (coding);
	  return 0;
	}

      head_skip = from_byte - from_byte_orig;
      tail_skip = to_byte_orig - to_byte;

    }

  if (coding->composing != COMPOSITION_DISABLED)
    coding_save_composition (coding, from, to, str);

  /* Try to skip the heading and tailing ASCIIs.  We can't skip them
     if we must run CCL program or there are compositions to
     encode.  */
  if (coding->type != coding_type_ccl
      && (! coding->cmp_data || coding->cmp_data->used == 0))
    {
      SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
				1);
      if (from == to_byte)
	{
	  coding_free_composition_data (coding);
	  return (nocopy ? str : Fcopy_sequence (str));
	}
      shrinked_bytes = from + (SBYTES (str) - to_byte);
    }

  len = encoding_buffer_size (coding, to_byte - from);
  allocate_conversion_buffer (buf, len);