comparison src/fileio.c @ 18679:554594d88cd3

(Finsert_file_contents): Give up match-end only if coding requires conversion. Adjust end of non-matching text area to multibyte character boundary if enable_multibyte_character is non-nil.

18678:d26f9720e55f

	    {
	      /* If this discrepancy is because of code conversion,
		 we cannot use this method; giveup and try the other.  */
	      if (same_at_end > same_at_start
		  && FETCH_BYTE (same_at_end - 1) >= 0200
		  && ! NILP (current_buffer->enable_multibyte_characters))
		giveup_match_end = 1;
	      break;
	    }
	}
      immediate_quit = 0;

      if (! giveup_match_end)
	{
	  /* We win!  We can handle REPLACE the optimized way.  */

	  /* Don't try to reuse the same piece of text twice.  */
	  overlap = same_at_start - BEGV - (same_at_end + st.st_size - ZV);
	  if (overlap > 0)
	    same_at_end += overlap;

18679:554594d88cd3

	    {
	      /* If this discrepancy is because of code conversion,
		 we cannot use this method; giveup and try the other.  */
	      if (same_at_end > same_at_start
		  && FETCH_BYTE (same_at_end - 1) >= 0200
		  && ! NILP (current_buffer->enable_multibyte_characters)
		  && CODING_REQUIRE_CONVERSION (&coding))
		giveup_match_end = 1;
	      break;
	    }
	}
      immediate_quit = 0;

      if (! giveup_match_end)
	{
	  /* We win!  We can handle REPLACE the optimized way.  */

	  /* Extends the end of non-matching text area to multibyte
             character boundary.  */
	  if (! NILP (current_buffer->enable_multibyte_characters))
	    while (same_at_end < ZV && ! CHAR_HEAD_P (POS_ADDR (same_at_end)))
	      same_at_end++;

	  /* Don't try to reuse the same piece of text twice.  */
	  overlap = same_at_start - BEGV - (same_at_end + st.st_size - ZV);
	  if (overlap > 0)
	    same_at_end += overlap;