comparison src/insdel.c @ 23538:84ad9e201361

(adjust_markers_for_insert): Adjust markers by taking combined_before_bytes and combined_after_bytes into account. (count_combining_after): Handle the case that LENGTH is zero. (adjust_after_replace): Record deletion at correct buffer position. Handle the case that LEN is zero. (replace_range): Record deletion at correct buffer position. (del_range_2): Call adjust_makers_for_replace to adjust makers for combined bytes.

23537:28cd5faf93dd

      if (m->bytepos == from_byte)
	{
	  if (m->insertion_type || before_markers)
	    {
	      m->bytepos += nbytes + combined_after_bytes;
	      m->charpos += nchars + !!combined_after_bytes;
	      /* Point the marker before the combined character,
		 so that undoing the insertion puts it back where it was.  */
	      if (combined_after_bytes)
		DEC_BOTH (m->charpos, m->bytepos);
	      if (m->insertion_type)

	    {
	      /* This marker doesn't "need relocation",
		 but don't leave it pointing in the middle of a character.
		 Point the marker after the combined character,
		 so that undoing the insertion puts it back where it was.  */

	      /* Here we depend on the fact that the gap is after
		 all of the combining bytes that we are going to skip over.  */
	      DEC_BOTH (m->charpos, m->bytepos);
	      INC_BOTH (m->charpos, m->bytepos);
	    }
	}
      /* If a marker was pointing into the combining bytes
	 after the insertion, don't leave it there
	 in the middle of a character.  */
      else if (combined_after_bytes && m->bytepos >= from_byte
	       && m->bytepos < from_byte + combined_after_bytes)
	{
	  /* Put it after the combining bytes.  */
	  m->bytepos = to_byte + combined_after_bytes;
	  m->charpos = to + 1;
	  /* Now move it back before the combined character,
	     so that undoing the insertion will put it where it was.  */
	  DEC_BOTH (m->charpos, m->bytepos);
	}
      else if (m->bytepos > from_byte)
	{
	  m->bytepos += nbytes;
	  m->charpos += nchars;
	}

      marker = m->chain;
    }

  int i;
  int c;

  if (NILP (current_buffer->enable_multibyte_characters))
    return 0;
  if (length == 0 || ASCII_BYTE_P (string[length - 1]))
    return 0;
  i = length - 1;
  while (i >= 0 && ! CHAR_HEAD_P (string[i]))
    {
      i--;

      combine_bytes (pos + nchars, pos_byte + nbytes, combined_after_bytes);

    if (combined_before_bytes)
      combine_bytes (pos, pos_byte, combined_before_bytes);
  }
}

/* Insert the part of the text of STRING, a Lisp object assumed to be
   of type string, consisting of the LENGTH characters (LENGTH_BYTE bytes)
   starting at position POS / POS_BYTE.  If the text of STRING has properties,

    = count_combining_before (GPT_ADDR, len_byte, from, from_byte);
  int combined_after_bytes
    = count_combining_after (GPT_ADDR, len_byte, from, from_byte);
  int nchars_del = 0, nbytes_del = 0;

  if (combined_after_bytes)
    {
      Lisp_Object deletion;
      deletion = Qnil;

      adjust_markers_for_record_delete (from, from_byte,
					from + combined_after_bytes,
					from_byte + combined_after_bytes);

      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (from + len, deletion);
    }

  if (combined_before_bytes)
    {
      Lisp_Object deletion;
      deletion = Qnil;

      if (! EQ (current_buffer->undo_list, Qt))

  ZV += len; Z+= len;
  ZV_BYTE += len_byte; Z_BYTE += len_byte;
  GPT += len; GPT_BYTE += len_byte;
  if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */

  if (combined_after_bytes)
    move_gap_both (GPT + combined_after_bytes,
		   GPT_BYTE + combined_after_bytes);

  if (STRINGP (prev_text))
    {
      nchars_del = XSTRING (prev_text)->size;
      nbytes_del = STRING_BYTES (XSTRING (prev_text));
    }
  adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
			      len, len_byte,
			      combined_before_bytes, combined_after_bytes);
  if (STRINGP (prev_text))
    record_delete (from - !!combined_before_bytes, prev_text);
  record_insert (from - !!combined_before_bytes,
		 len - combined_before_bytes + !!combined_before_bytes);

  if (len > nchars_del)
    adjust_overlays_for_insert (from, len - nchars_del);
  else if (len < nchars_del)
    adjust_overlays_for_delete (from, nchars_del - len);

    if (from < PT)
      adjust_point (len - nchars_del, len_byte - nbytes_del);

    if (combined_after_bytes)
      {
	if (combined_before_bytes)
	  combined_before_bytes += combined_after_bytes;
	else
	  combine_bytes (from + len, from_byte + len_byte,
			 combined_after_bytes);
      }

    if (combined_before_bytes)
      combine_bytes (from, from_byte, combined_before_bytes);
  }

      deletion = Qnil;

      if (! EQ (current_buffer->undo_list, Qt))
	deletion = make_buffer_string_both (from, from_byte,
					    from + combined_after_bytes,
					    from_byte + combined_after_bytes, 1);

      adjust_markers_for_record_delete (from, from_byte,
					from + combined_after_bytes,
					from_byte + combined_after_bytes);
      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (from + inschars, deletion);
    }

  if (combined_before_bytes)
    {
      Lisp_Object deletion;

    adjust_point ((from + inschars - (PT < to ? PT : to)),
		  (from_byte + outgoing_insbytes
		   - (PT_BYTE < to_byte ? PT_BYTE : to_byte)));

  if (combined_after_bytes)
    {
      if (combined_before_bytes)
	combined_before_bytes += combined_after_bytes;
      else
	combine_bytes (from + inschars, from_byte + outgoing_insbytes,
		       combined_after_bytes);
    }
  if (combined_before_bytes)
    combine_bytes (from, from_byte, combined_before_bytes);

  if (outgoing_insbytes == 0)
    evaporate_overlays (from);

  if (Z - GPT < end_unchanged)
    end_unchanged = Z - GPT;

  if (combined_after_bytes)
    {
      combine_bytes (from, from_byte, combined_after_bytes);

      record_insert (GPT - 1, 1);
    }

23538:84ad9e201361

      if (m->bytepos == from_byte)
	{
	  if (m->insertion_type || before_markers)
	    {
	      m->bytepos = to_byte + combined_after_bytes;
	      m->charpos = to - combined_before_bytes;
	      /* Point the marker before the combined character,
		 so that undoing the insertion puts it back where it was.  */
	      if (combined_after_bytes)
		DEC_BOTH (m->charpos, m->bytepos);
	      if (m->insertion_type)

	    {
	      /* This marker doesn't "need relocation",
		 but don't leave it pointing in the middle of a character.
		 Point the marker after the combined character,
		 so that undoing the insertion puts it back where it was.  */
	      m->bytepos += combined_before_bytes;
	    }
	}
      /* If a marker was pointing into the combining bytes
	 after the insertion, don't leave it there
	 in the middle of a character.  */
      else if (combined_after_bytes && m->bytepos >= from_byte
	       && m->bytepos < from_byte + combined_after_bytes)
	{
	  /* Put it after the combining bytes.  */
	  m->bytepos = to_byte + combined_after_bytes;
	  m->charpos = to - combined_before_bytes;
	  /* Now move it back before the combined character,
	     so that undoing the insertion will put it where it was.  */
	  DEC_BOTH (m->charpos, m->bytepos);
	}
      else if (m->bytepos > from_byte)
	{
	  m->bytepos += nbytes;
	  m->charpos += nchars - combined_after_bytes - combined_before_bytes;
	}

      marker = m->chain;
    }

  int i;
  int c;

  if (NILP (current_buffer->enable_multibyte_characters))
    return 0;
  if (length > 0 && ASCII_BYTE_P (string[length - 1]))
    return 0;
  i = length - 1;
  while (i >= 0 && ! CHAR_HEAD_P (string[i]))
    {
      i--;

      combine_bytes (pos + nchars, pos_byte + nbytes, combined_after_bytes);

    if (combined_before_bytes)
      combine_bytes (pos, pos_byte, combined_before_bytes);
  }

  CHECK_MARKERS ();
}

/* Insert the part of the text of STRING, a Lisp object assumed to be
   of type string, consisting of the LENGTH characters (LENGTH_BYTE bytes)
   starting at position POS / POS_BYTE.  If the text of STRING has properties,

    = count_combining_before (GPT_ADDR, len_byte, from, from_byte);
  int combined_after_bytes
    = count_combining_after (GPT_ADDR, len_byte, from, from_byte);
  int nchars_del = 0, nbytes_del = 0;

  if (STRINGP (prev_text))
    {
      nchars_del = XSTRING (prev_text)->size;
      nbytes_del = STRING_BYTES (XSTRING (prev_text));
    }

  if (combined_after_bytes)
    {
      Lisp_Object deletion;
      deletion = Qnil;

      adjust_markers_for_record_delete (from, from_byte,
					from + combined_after_bytes,
					from_byte + combined_after_bytes);

      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (from + nchars_del, deletion);
    }

  if (combined_before_bytes
      || len_byte == 0 && combined_after_bytes > 0)
    {
      Lisp_Object deletion;
      deletion = Qnil;

      if (! EQ (current_buffer->undo_list, Qt))

  ZV += len; Z+= len;
  ZV_BYTE += len_byte; Z_BYTE += len_byte;
  GPT += len; GPT_BYTE += len_byte;
  if (GAP_SIZE > 0) *(GPT_ADDR) = 0; /* Put an anchor. */

  /* The gap should be at character boundary.  */
  if (combined_after_bytes)
    move_gap_both (GPT + combined_after_bytes,
		   GPT_BYTE + combined_after_bytes);

  adjust_markers_for_replace (from, from_byte, nchars_del, nbytes_del,
			      len, len_byte,
			      combined_before_bytes, combined_after_bytes);
  if (! EQ (current_buffer->undo_list, Qt))
    {
      /* This flag tells if we combine some bytes with a character
	 before FROM.  This happens even if combined_before_bytes is
	 zero.  */
      int combine_before = (combined_before_bytes
			    || (len == 0 && combined_after_bytes));

      if (nchars_del > 0)
	record_delete (from - combine_before, prev_text);
      if (combine_before)
	record_insert (from - 1, len - combined_before_bytes + 1);
      else
	record_insert (from, len);
    }

  if (len > nchars_del)
    adjust_overlays_for_insert (from, len - nchars_del);
  else if (len < nchars_del)
    adjust_overlays_for_delete (from, nchars_del - len);

    if (from < PT)
      adjust_point (len - nchars_del, len_byte - nbytes_del);

    if (combined_after_bytes)
      combine_bytes (from + len, from_byte + len_byte, combined_after_bytes);

    if (combined_before_bytes)
      combine_bytes (from, from_byte, combined_before_bytes);
  }

      deletion = Qnil;

      if (! EQ (current_buffer->undo_list, Qt))
	deletion = make_buffer_string_both (from, from_byte,
					    from + combined_after_bytes,
					    from_byte + combined_after_bytes,
					    1);

      adjust_markers_for_record_delete (from, from_byte,
					from + combined_after_bytes,
					from_byte + combined_after_bytes);
      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (from + nchars_del, deletion);
    }

  if (combined_before_bytes)
    {
      Lisp_Object deletion;

    adjust_point ((from + inschars - (PT < to ? PT : to)),
		  (from_byte + outgoing_insbytes
		   - (PT_BYTE < to_byte ? PT_BYTE : to_byte)));

  if (combined_after_bytes)
    combine_bytes (from + inschars, from_byte + outgoing_insbytes,
		   combined_after_bytes);
  if (combined_before_bytes)
    combine_bytes (from, from_byte, combined_before_bytes);

  if (outgoing_insbytes == 0)
    evaporate_overlays (from);

  if (Z - GPT < end_unchanged)
    end_unchanged = Z - GPT;

  if (combined_after_bytes)
    {
      /* Adjust markers for byte combining.  As we have already
         adjuted markers without concerning byte combining, here we
         must concern only byte combining.  */
      adjust_markers_for_replace (from, from_byte, 0, 0, 0, 0,
				  0, combined_after_bytes);
      combine_bytes (from, from_byte, combined_after_bytes);

      record_insert (GPT - 1, 1);
    }