comparison src/insdel.c @ 23597:fda73fa21974

(byte_combining_error): New function. (CHECK_BYTE_COMBINING_FOR_INSERT): Call byte_combining_error. (insert_from_string_1): Set *(GPT_ADDR) to 0 before calling CHECK_BYTE_COMBINING_FOR_INSERT. (insert_from_buffer_1): Likewise. (adjust_after_replace): Check the posibility of inhibitted byte combining correctly. (replace_range): Before signaling an error for inhibitted byte combining, recover the buffer in a safe state. (del_range_2): Check the posibility of inhibitted byte combining correctly.

23596:8dcbcad4482c

  if (BUF_INTERVALS (current_buffer) != 0)
    /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES.  */
    offset_intervals (current_buffer, pos, - nbytes);
}

/* If we are going to combine bytes at POS which is at a narrowed
   region boundary, signal an error.  */
#define CHECK_BYTE_COMBINING_FOR_INSERT(pos)				\
  do {									\
    if (combined_before_bytes && pos == BEGV				\
	|| combined_after_bytes && pos == ZV)				\
      error ("Byte combining across region boundary inhibitted");	\
  } while (0)


/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
   starting at STRING.  INHERIT, PREPARE and BEFORE_MARKERS

    = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  combined_after_bytes
    = count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  {
    unsigned char save = *(GPT_ADDR);
    CHECK_BYTE_COMBINING_FOR_INSERT (PT);
    *(GPT_ADDR) = save;
  }

  /* Record deletion of the surrounding text that combines with

    = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  combined_after_bytes
    = count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  {
    unsigned char save = *(GPT_ADDR);
    CHECK_BYTE_COMBINING_FOR_INSERT (PT);
    *(GPT_ADDR) = save;
  }

  /* Record deletion of the surrounding text that combines with

{
  int combined_before_bytes
    = 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_before_bytes && from == BEGV
      || combined_after_bytes && from == ZV)
    {
      /* We can't combine bytes nor signal an error here.  So, let's
	 pretend that the new text is just a single space.  */
      len = len_byte = 1;

  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

  if (from > GPT)
    gap_right (from, from_byte);
  if (to < GPT)
    gap_left (to, to_byte, 0);

  deletion = Qnil;

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

  if (markers)
    /* Relocate all markers pointing into the new, larger gap
       to point at the end of the text before the gap.
       Do this before recording the deletion,

  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);
  {
    unsigned char save = *(GPT_ADDR);
    CHECK_BYTE_COMBINING_FOR_INSERT (from);
    *(GPT_ADDR) = save;
  }

  /* 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.

  combined_after_bytes
    = count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
			      Z_BYTE - to_byte, from, from_byte);
  if (combined_after_bytes)
    {
      if (to == ZV_BYTE)
	error ("Byte combining across region boundary inhibitted");
      from_byte_1 = from_byte;
      DEC_POS (from_byte_1);
    }
  else
    from_byte_1 = from_byte;

23597:fda73fa21974

  if (BUF_INTERVALS (current_buffer) != 0)
    /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES.  */
    offset_intervals (current_buffer, pos, - nbytes);
}

void
byte_combining_error ()
{
  error ("Byte combining across region boundary inhibitted");
}

/* If we are going to combine bytes at POS which is at a narrowed
   region boundary, signal an error.  */
#define CHECK_BYTE_COMBINING_FOR_INSERT(pos)				\
  do {									\
    if (combined_before_bytes && pos == BEGV				\
	|| combined_after_bytes && pos == ZV)				\
      byte_combining_error ();	\
  } while (0)


/* Insert a sequence of NCHARS chars which occupy NBYTES bytes
   starting at STRING.  INHERIT, PREPARE and BEFORE_MARKERS

    = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  combined_after_bytes
    = count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  {
    unsigned char save = *(GPT_ADDR);
    *(GPT_ADDR) = 0;
    CHECK_BYTE_COMBINING_FOR_INSERT (PT);
    *(GPT_ADDR) = save;
  }

  /* Record deletion of the surrounding text that combines with

    = count_combining_before (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  combined_after_bytes
    = count_combining_after (GPT_ADDR, outgoing_nbytes, PT, PT_BYTE);
  {
    unsigned char save = *(GPT_ADDR);
    *(GPT_ADDR) = 0;
    CHECK_BYTE_COMBINING_FOR_INSERT (PT);
    *(GPT_ADDR) = save;
  }

  /* Record deletion of the surrounding text that combines with

{
  int combined_before_bytes
    = count_combining_before (GPT_ADDR, len_byte, from, from_byte);
  int combined_after_bytes
    = count_combining_after (GPT_ADDR, len_byte, from, from_byte);
  /* 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));

  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 (combine_before && from == BEGV
      || combined_after_bytes && from == ZV)
    {
      /* We can't combine bytes nor signal an error here.  So, let's
	 pretend that the new text is just a single space.  */
      len = len_byte = 1;

  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))
    {
      if (nchars_del > 0)
	record_delete (from - combine_before, prev_text);
      if (combine_before)
	record_insert (from - 1, len - combined_before_bytes + 1);
      else

  if (from > GPT)
    gap_right (from, from_byte);
  if (to < GPT)
    gap_left (to, to_byte, 0);

  /* Even if we don't record for undo, we must keep the original text
     because we may have to recover it because of inappropriate byte
     combining.  */
  deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);

  if (markers)
    /* Relocate all markers pointing into the new, larger gap
       to point at the end of the text before the gap.
       Do this before recording the deletion,

  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);

  if (combined_before_bytes && from == BEGV
      || combined_after_bytes && from == ZV)
    {
      /* Bytes are being combined across the region boundary.  We
         should avoid it.  We recover the original contents before
         signaling an error.  */
      bcopy (XSTRING (deletion)->data, GPT_ADDR, nbytes_del);
      GAP_SIZE -= nbytes_del;
      ZV += nchars_del;
      Z += nchars_del;
      ZV_BYTE += nbytes_del;
      Z_BYTE += nbytes_del;
      GPT = from + nchars_del;
      GPT_BYTE = from_byte + nbytes_del;
      *(GPT_ADDR) = 0;		/* Put an anchor.  */
      if (markers)
	adjust_markers_for_insert (from, from_byte, to, to_byte, 0, 0, 0);
      byte_combining_error ();
    }

  /* 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.

  combined_after_bytes
    = count_combining_before (BUF_BYTE_ADDRESS (current_buffer, to_byte),
			      Z_BYTE - to_byte, from, from_byte);
  if (combined_after_bytes)
    {
      if (from == BEGV || to == ZV)
	byte_combining_error ();
      from_byte_1 = from_byte;
      DEC_POS (from_byte_1);
    }
  else
    from_byte_1 = from_byte;