comparison src/insdel.c @ 22896:6d368c9a689e

(replace_range): Don't assume PT is at the place where the change is being done.

22895:9f800ebc6091

     between single-byte and multibyte.  */
  copy_text (XSTRING (new)->data, GPT_ADDR, insbytes,
	     STRING_MULTIBYTE (new),
	     ! NILP (current_buffer->enable_multibyte_characters));

  /* We have copied text into the gap, but we have not altered
     PT or PT_BYTE yet.  So we can pass PT and PT_BYTE
     to these functions and get the same results as we would
     have got earlier on.  Meanwhile, GPT_ADDR does point to
     the text that has been stored by copy_text.  */

  combined_before_bytes
    = count_combining_before (GPT_ADDR, outgoing_insbytes, PT, PT_BYTE);
  combined_after_bytes
    = count_combining_after (GPT_ADDR, outgoing_insbytes, PT, PT_BYTE);

  /* Record deletion of the surrounding text that combines with
     the insertion.  This, together with recording the insertion,
     will add up to the right stuff in the undo list.

    {
      Lisp_Object deletion;
      deletion = Qnil;

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

      adjust_markers_for_record_delete (PT, PT_BYTE,
					PT + combined_after_bytes,
					PT_BYTE + combined_after_bytes);
      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (PT, deletion);
    }

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

      if (! EQ (current_buffer->undo_list, Qt))
	deletion = make_buffer_string_both (PT - 1, CHAR_TO_BYTE (PT - 1),
					    PT, PT_BYTE, 1);
      adjust_markers_for_record_delete (PT - 1, CHAR_TO_BYTE (PT - 1),
					PT, PT_BYTE);
      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (PT - 1, deletion);
    }

  record_insert (PT - !!combined_before_bytes,
		 inschars - combined_before_bytes + !!combined_before_bytes);

  GAP_SIZE -= outgoing_insbytes;
  GPT += inschars;
  ZV += inschars;

    adjust_markers_for_insert (from, from_byte,
			       from + inschars, from_byte + outgoing_insbytes,
			       combined_before_bytes, combined_after_bytes, 0);

#ifdef USE_TEXT_PROPERTIES
  offset_intervals (current_buffer, PT, inschars - nchars_del);

  /* Get the intervals for the part of the string we are inserting--
     not including the combined-before bytes.  */
  intervals = XSTRING (new)->intervals;
  /* Insert those intervals.  */

  CHECK_MARKERS ();

  MODIFF++;
  UNGCPRO;

  signal_after_change (from, nchars_del, PT - from);
}

/* Delete characters in current buffer
   from FROM up to (but not including) TO.
   If TO comes before FROM, we delete nothing.  */

22896:6d368c9a689e

     between single-byte and multibyte.  */
  copy_text (XSTRING (new)->data, GPT_ADDR, insbytes,
	     STRING_MULTIBYTE (new),
	     ! NILP (current_buffer->enable_multibyte_characters));

  /* We have copied text into the gap, but we have not marked
     it as part of the buffer.  So we can use the old FROM and FROM_BYTE
     here, for both the previous text and the following text.
     Meanwhile, GPT_ADDR does point to
     the text that has been stored by copy_text.  */

  combined_before_bytes
    = count_combining_before (GPT_ADDR, outgoing_insbytes, from, from_byte);
  combined_after_bytes
    = count_combining_after (GPT_ADDR, outgoing_insbytes, from, from_byte);

  /* Record deletion of the surrounding text that combines with
     the insertion.  This, together with recording the insertion,
     will add up to the right stuff in the undo list.

    {
      Lisp_Object deletion;
      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, deletion);
    }

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

      if (! EQ (current_buffer->undo_list, Qt))
	deletion = make_buffer_string_both (from - 1, CHAR_TO_BYTE (from - 1),
					    from, from_byte, 1);
      adjust_markers_for_record_delete (from - 1, CHAR_TO_BYTE (from - 1),
					from, from_byte);
      if (! EQ (current_buffer->undo_list, Qt))
	record_delete (from - 1, deletion);
    }

  record_insert (from - !!combined_before_bytes,
		 inschars - combined_before_bytes + !!combined_before_bytes);

  GAP_SIZE -= outgoing_insbytes;
  GPT += inschars;
  ZV += inschars;

    adjust_markers_for_insert (from, from_byte,
			       from + inschars, from_byte + outgoing_insbytes,
			       combined_before_bytes, combined_after_bytes, 0);

#ifdef USE_TEXT_PROPERTIES
  offset_intervals (current_buffer, from, inschars - nchars_del);

  /* Get the intervals for the part of the string we are inserting--
     not including the combined-before bytes.  */
  intervals = XSTRING (new)->intervals;
  /* Insert those intervals.  */

  CHECK_MARKERS ();

  MODIFF++;
  UNGCPRO;

  signal_after_change (from, nchars_del, GPT - from);
}

/* Delete characters in current buffer
   from FROM up to (but not including) TO.
   If TO comes before FROM, we delete nothing.  */