comparison src/insdel.c @ 25373:6e6b29a72e2c

(gap_left): Use BUF_COMPUTE_UNCHANGED. (gap_right): Ditto. (modify_region): Ditto. (gap_left): Compute beg/end_unchanged per buffer. (gap_right): Ditto. (adjust_after_replace): Likewise. (replace_range, del_range_2, modify_region): Likewise.

25372:acf281b41a38

  register unsigned char *to, *from;
  register int i;
  int new_s1;

  if (!newgap)
    {
      if (unchanged_modified == MODIFF
	  && overlay_unchanged_modified == OVERLAY_MODIFF)
	{
	  beg_unchanged = charpos - BEG;
	  end_unchanged = Z - charpos;
	}
      else
	{
	  if (Z - GPT < end_unchanged)
	    end_unchanged = Z - GPT;
	  if (charpos < beg_unchanged)
	    beg_unchanged = charpos - BEG;
	}
    }

  i = GPT_BYTE;
  to = GAP_END_ADDR;
  from = GPT_ADDR;
  new_s1 = GPT_BYTE;

{
  register unsigned char *to, *from;
  register int i;
  int new_s1;

  if (unchanged_modified == MODIFF
      && overlay_unchanged_modified == OVERLAY_MODIFF)
    {
      beg_unchanged = charpos - BEG;
      end_unchanged = Z - charpos;
    }
  else
    {
      if (Z - charpos - 1 < end_unchanged)
	end_unchanged = Z - charpos;
      if (GPT - BEG < beg_unchanged)
	beg_unchanged = GPT - BEG;
    }

  i = GPT_BYTE;
  from = GAP_END_ADDR;
  to = GPT_ADDR;
  new_s1 = GPT_BYTE;

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

  /* As byte combining will decrease Z, we must check this again. */
  if (Z - GPT < end_unchanged)
    end_unchanged = Z - GPT;

  CHECK_MARKERS ();

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

  *(GPT_ADDR) = 0;		/* Put an anchor.  */

  if (GPT_BYTE < GPT)
    abort ();

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

  if (GAP_SIZE < insbytes)
    make_gap (insbytes - GAP_SIZE);

  /* Copy the string text into the buffer, perhaps converting

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

  /* As byte combining will decrease Z, we must check this again. */
  if (Z - GPT < end_unchanged)
    end_unchanged = Z - GPT;

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

  CHECK_MARKERS ();

  *(GPT_ADDR) = 0;		/* Put an anchor.  */

  if (GPT_BYTE < GPT)
    abort ();

  if (GPT - BEG < beg_unchanged)
    beg_unchanged = GPT - BEG;
  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

				  0, combined_after_bytes);
      combine_bytes (from, from_byte, combined_after_bytes);

      record_insert (GPT - 1, 1);

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

  CHECK_MARKERS ();

  evaporate_overlays (from);

  if (buffer != old_buffer)
    set_buffer_internal (buffer);

  prepare_to_modify_buffer (start, end, NULL);

  if (start - 1 < beg_unchanged
      || (unchanged_modified == MODIFF
	  && overlay_unchanged_modified == OVERLAY_MODIFF))
    beg_unchanged = start - 1;
  if (Z - end < end_unchanged
      || (unchanged_modified == MODIFF
	  && overlay_unchanged_modified == OVERLAY_MODIFF))
    end_unchanged = Z - end;

  if (MODIFF <= SAVE_MODIFF)
    record_first_change ();
  MODIFF++;

25373:6e6b29a72e2c

  register unsigned char *to, *from;
  register int i;
  int new_s1;

  if (!newgap)
    BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);

  i = GPT_BYTE;
  to = GAP_END_ADDR;
  from = GPT_ADDR;
  new_s1 = GPT_BYTE;

{
  register unsigned char *to, *from;
  register int i;
  int new_s1;

  BUF_COMPUTE_UNCHANGED (current_buffer, charpos, GPT);

  i = GPT_BYTE;
  from = GAP_END_ADDR;
  to = GPT_ADDR;
  new_s1 = GPT_BYTE;

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

  /* As byte combining will decrease Z, we must check this again. */
  if (Z - GPT < END_UNCHANGED)
    END_UNCHANGED = Z - GPT;

  CHECK_MARKERS ();

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

  *(GPT_ADDR) = 0;		/* Put an anchor.  */

  if (GPT_BYTE < GPT)
    abort ();

  if (GPT - BEG < BEG_UNCHANGED)
    BEG_UNCHANGED = GPT - BEG;
  if (Z - GPT < END_UNCHANGED)
    END_UNCHANGED = Z - GPT;

  if (GAP_SIZE < insbytes)
    make_gap (insbytes - GAP_SIZE);

  /* Copy the string text into the buffer, perhaps converting

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

  /* As byte combining will decrease Z, we must check this again. */
  if (Z - GPT < END_UNCHANGED)
    END_UNCHANGED = Z - GPT;

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

  CHECK_MARKERS ();

  *(GPT_ADDR) = 0;		/* Put an anchor.  */

  if (GPT_BYTE < GPT)
    abort ();

  if (GPT - BEG < BEG_UNCHANGED)
    BEG_UNCHANGED = GPT - BEG;
  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

				  0, combined_after_bytes);
      combine_bytes (from, from_byte, combined_after_bytes);

      record_insert (GPT - 1, 1);

      if (Z - GPT < END_UNCHANGED)
	END_UNCHANGED = Z - GPT;
    }

  CHECK_MARKERS ();

  evaporate_overlays (from);

  if (buffer != old_buffer)
    set_buffer_internal (buffer);

  prepare_to_modify_buffer (start, end, NULL);

  BUF_COMPUTE_UNCHANGED (buffer, start - 1, end);

  if (MODIFF <= SAVE_MODIFF)
    record_first_change ();
  MODIFF++;