comparison src/editfns.c @ 22895:9f800ebc6091

(Fsubst_char_in_region): Use replace_range in the case where we may need to combine bytes. (Ftranslate_region): Likewise.

22894:186b2098dcd8

		}

	      changed = 1;
	    }

	  if (NILP (noundo))
	    record_change (pos, 1);
	  for (i = 0; i < len; i++) *p++ = tostr[i];
	}
      INC_BOTH (pos, pos_byte);
    }

  if (changed)

      if (oc < size && len == 1)
	{
	  nc = tt[oc];
	  if (nc != oc)
	    {
	      record_change (pos, 1);
	      *p = nc;
	      signal_after_change (pos, 1, 1);
	      ++cnt;
	    }
	}
      pos_byte += len;
      pos++;

22895:9f800ebc6091

		}

	      changed = 1;
	    }

	  /* Take care of the case where the new character
	     combines with neighboring bytes.  */ 
	  if (len == 1
	      && ((! CHAR_HEAD_P (tostr[0])
		   && pos_byte > BEGV_BYTE
		   && ! ASCII_BYTE_P (FETCH_BYTE (pos_byte - 1)))
		  ||
		  (! ASCII_BYTE_P (tostr[0])
		   && pos_byte + 1 < ZV_BYTE
		   && ! CHAR_HEAD_P (FETCH_BYTE (pos_byte + 1)))))
	    {
	      Lisp_Object tem, string;

	      struct gcpro gcpro1;

	      tem = current_buffer->undo_list;
	      GCPRO1 (tem);

	      /* Make a multibyte string containing this
		 single-byte character.  */
	      string = Fmake_string (make_number (1),
				     make_number (tochar));
	      SET_STRING_BYTES (XSTRING (string), 1);
	      /* replace_range is less efficient, because it moves the gap,
		 but it handles combining correctly.  */
	      replace_range (pos, pos + 1, string,
			     0, 0, 0);
	      if (! NILP (noundo))
		current_buffer->undo_list = tem;

	      UNGCPRO;
	    }
	  else
	    {
	      if (NILP (noundo))
		record_change (pos, 1);
	      for (i = 0; i < len; i++) *p++ = tostr[i];
	    }
	}
      INC_BOTH (pos, pos_byte);
    }

  if (changed)

      if (oc < size && len == 1)
	{
	  nc = tt[oc];
	  if (nc != oc)
	    {
	      /* Take care of the case where the new character
		 combines with neighboring bytes.  */ 
	      if ((! CHAR_HEAD_P (nc)
		   && pos_byte > BEGV_BYTE
		   && ! ASCII_BYTE_P (FETCH_BYTE (pos_byte - 1)))
		  ||
		  (! ASCII_BYTE_P (nc)
		   && pos_byte + 1 < ZV_BYTE
		   && ! CHAR_HEAD_P (FETCH_BYTE (pos_byte + 1))))
		{
		  Lisp_Object string;

		  string = Fmake_string (make_number (1),
					 make_number (nc));
		  SET_STRING_BYTES (XSTRING (string), 1);

		  /* This is less efficient, because it moves the gap,
		     but it handles combining correctly.  */
		  replace_range (pos, pos + 1, string,
				 1, 0, 0);
		}
	      else
		{
		  record_change (pos, 1);
		  *p = nc;
		  signal_after_change (pos, 1, 1);
		}
	      ++cnt;
	    }
	}
      pos_byte += len;
      pos++;