comparison src/search.c @ 66078:2fe97fc2ee41

(search_buffer): Give up BM search on case-fold-search if one of a target character has a case-equivalence of different charset even if that target charcter is an ASCII.

66077:68d711d80f2f

      int raw_pattern_size;
      int raw_pattern_size_byte;
      unsigned char *patbuf;
      int multibyte = !NILP (current_buffer->enable_multibyte_characters);
      unsigned char *base_pat = SDATA (string);
      /* Set to nozero if we find a non-ASCII char that need
	 translation.  */
      int charset_base = 0;
      int boyer_moore_ok = 1;

      /* MULTIBYTE says whether the text to be searched is multibyte.
	 We must convert PATTERN to match that, or we will not really
	 find things right.  */

			 also that we don't have to check ASCII
			 characters because boyer-moore search can
			 always handle their translation.  */
		      while (1)
			{
			  if (! ASCII_BYTE_P (inverse))
			    {
			      if (SINGLE_BYTE_CHAR_P (inverse))
				{
				  /* Boyer-moore search can't handle a
				     translation of an eight-bit
				     character.  */
				  boyer_moore_ok = 0;
				  break;
				}
			      else if (charset_base == 0)
				charset_base = inverse & ~CHAR_FIELD3_MASK;
			      else if ((inverse & ~CHAR_FIELD3_MASK)
				       != charset_base)
				{
				  boyer_moore_ok = 0;
				  break;
				}
			    }
			  if (c == inverse)
			    break;
			  TRANSLATE (inverse, inverse_trt, inverse);
			}
		    }
		}

	      /* Store this character into the translated pattern.  */
	      bcopy (str, pat, charlen);
	      pat += charlen;
	      base_pat += in_charlen;

66078:2fe97fc2ee41

      int raw_pattern_size;
      int raw_pattern_size_byte;
      unsigned char *patbuf;
      int multibyte = !NILP (current_buffer->enable_multibyte_characters);
      unsigned char *base_pat = SDATA (string);
      /* Set to positive if we find a non-ASCII char that need
	 translation.  Otherwise set to zero later.  */
      int charset_base = -1;
      int boyer_moore_ok = 1;

      /* MULTIBYTE says whether the text to be searched is multibyte.
	 We must convert PATTERN to match that, or we will not really
	 find things right.  */

			 also that we don't have to check ASCII
			 characters because boyer-moore search can
			 always handle their translation.  */
		      while (1)
			{
			  if (ASCII_BYTE_P (inverse))
			    {
			      if (charset_base > 0)
				{
				  boyer_moore_ok = 0;
				  break;
				}
			      charset_base = 0;
			    }
			  else if (SINGLE_BYTE_CHAR_P (inverse))
			    {
			      /* Boyer-moore search can't handle a
				 translation of an eight-bit
				 character.  */
			      boyer_moore_ok = 0;
			      break;
			    }
			  else if (charset_base < 0)
			    charset_base = inverse & ~CHAR_FIELD3_MASK;
			  else if ((inverse & ~CHAR_FIELD3_MASK)
				   != charset_base)
			    {
			      boyer_moore_ok = 0;
			      break;
			    }
			  if (c == inverse)
			    break;
			  TRANSLATE (inverse, inverse_trt, inverse);
			}
		    }
		}
	      if (charset_base < 0)
		charset_base = 0;

	      /* Store this character into the translated pattern.  */
	      bcopy (str, pat, charlen);
	      pat += charlen;
	      base_pat += in_charlen;