comparison src/insdel.c @ 25764:72f00825a576

(copy_text): Removed unused variables. (count_combining_after, count_combining_after, insert_1_both, insert_from_string_1, insert_from_buffer_1, check_markers): Ditto. (adjust_after_replace, replace_range): Add parentheses to logical expressions. Remove unused variables. (CHECK_BYTE_COMBINING_FOR_INSERT): Add parentheses to logical expression.

25763:20d4d2a42062

  else

void
check_markers ()
{
  register Lisp_Object tail, prev, next;
  int multibyte = ! NILP (current_buffer->enable_multibyte_characters);

  tail = BUF_MARKERS (current_buffer);

  while (XSYMBOL (tail) != XSYMBOL (Qnil))

    }
  else if (from_multibyte)
    {
      int nchars = 0;
      int bytes_left = nbytes;
      Lisp_Object tbl = Qnil, temp;

      /* We set the variable tbl to the reverse table of
         Vnonascii_translation_table in advance.  */
      if (CHAR_TABLE_P (Vnonascii_translation_table))
	{

count_combining_after (string, length, pos, pos_byte)
     unsigned char *string;
     int length;
     int pos, pos_byte;
{
  int opos = pos, opos_byte = pos_byte;
  int i;
  int c, bytes;
  unsigned char *bufp;

  if (NILP (current_buffer->enable_multibyte_characters))
    return 0;

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

insert_1_both (string, nchars, nbytes, inherit, prepare, before_markers)
     register unsigned char *string;
     register int nchars, nbytes;
     int inherit, prepare, before_markers;
{
  register Lisp_Object temp;
  int combined_before_bytes, combined_after_bytes;

  if (NILP (current_buffer->enable_multibyte_characters))
    nchars = nbytes;

		      inherit, before_markers)
     Lisp_Object string;
     register int pos, pos_byte, nchars, nbytes;
     int inherit, before_markers;
{
  register Lisp_Object temp;
  struct gcpro gcpro1;
  int outgoing_nbytes = nbytes;
  int combined_before_bytes, combined_after_bytes;
  int adjusted_nchars;
  INTERVAL intervals;

  /* Make OUTGOING_NBYTES describe the text
     as it will be inserted in this buffer.  */

  int from_byte = buf_charpos_to_bytepos (buf, from);
  int to_byte = buf_charpos_to_bytepos (buf, from + nchars);
  int incoming_nbytes = to_byte - from_byte;
  int outgoing_nbytes = incoming_nbytes;
  int combined_before_bytes, combined_after_bytes;
  int adjusted_nchars;
  INTERVAL intervals;

  /* Make OUTGOING_NBYTES describe the text
     as it will be inserted in this buffer.  */

    {
      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;
      combined_before_bytes = combined_after_bytes = 0;

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

      offset_intervals (current_buffer, from, len - nchars_del);
    }
#endif

  {
    int pos = PT, pos_byte = PT_BYTE;

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

    if (combined_after_bytes)
      {

  int from_byte, to_byte;
  int nbytes_del, nchars_del;
  register Lisp_Object temp;
  struct gcpro gcpro1;
  int combined_before_bytes, combined_after_bytes;
  int adjusted_inschars;
  INTERVAL intervals;
  int outgoing_insbytes = insbytes;
  Lisp_Object deletion;

  CHECK_MARKERS ();

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

25764:72f00825a576

  else

void
check_markers ()
{
  register Lisp_Object tail;
  int multibyte = ! NILP (current_buffer->enable_multibyte_characters);

  tail = BUF_MARKERS (current_buffer);

  while (XSYMBOL (tail) != XSYMBOL (Qnil))

    }
  else if (from_multibyte)
    {
      int nchars = 0;
      int bytes_left = nbytes;
      Lisp_Object tbl = Qnil;

      /* We set the variable tbl to the reverse table of
         Vnonascii_translation_table in advance.  */
      if (CHAR_TABLE_P (Vnonascii_translation_table))
	{

count_combining_after (string, length, pos, pos_byte)
     unsigned char *string;
     int length;
     int pos, pos_byte;
{
  int opos_byte = pos_byte;
  int i;
  int bytes;
  unsigned char *bufp;

  if (NILP (current_buffer->enable_multibyte_characters))
    return 0;

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

insert_1_both (string, nchars, nbytes, inherit, prepare, before_markers)
     register unsigned char *string;
     register int nchars, nbytes;
     int inherit, prepare, before_markers;
{
  int combined_before_bytes, combined_after_bytes;

  if (NILP (current_buffer->enable_multibyte_characters))
    nchars = nbytes;

		      inherit, before_markers)
     Lisp_Object string;
     register int pos, pos_byte, nchars, nbytes;
     int inherit, before_markers;
{
  struct gcpro gcpro1;
  int outgoing_nbytes = nbytes;
  int combined_before_bytes, combined_after_bytes;
  INTERVAL intervals;

  /* Make OUTGOING_NBYTES describe the text
     as it will be inserted in this buffer.  */

  int from_byte = buf_charpos_to_bytepos (buf, from);
  int to_byte = buf_charpos_to_bytepos (buf, from + nchars);
  int incoming_nbytes = to_byte - from_byte;
  int outgoing_nbytes = incoming_nbytes;
  int combined_before_bytes, combined_after_bytes;
  INTERVAL intervals;

  /* Make OUTGOING_NBYTES describe the text
     as it will be inserted in this buffer.  */

    {
      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;
      combined_before_bytes = combined_after_bytes = 0;

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

      offset_intervals (current_buffer, from, len - nchars_del);
    }
#endif

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

    if (combined_after_bytes)
      {

  int from_byte, to_byte;
  int nbytes_del, nchars_del;
  register Lisp_Object temp;
  struct gcpro gcpro1;
  int combined_before_bytes, combined_after_bytes;
  INTERVAL intervals;
  int outgoing_insbytes = insbytes;
  Lisp_Object deletion;

  CHECK_MARKERS ();

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