(Finsert_file_contents): If enable-multibyte-characters

[bpt/emacs.git] / src / search.c

diff --git a/src/search.c b/src/search.c
index 88d2202..790f35f 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -394,7 +394,7 @@ fast_string_match (regexp, string)
 extern Lisp_Object Vascii_downcase_table;
 
 int
-fast_string_match_ignore_case (regexp, string)
+fast_c_string_match_ignore_case (regexp, string)
      Lisp_Object regexp;
      char *string;
 {
@@ -402,6 +402,7 @@ fast_string_match_ignore_case (regexp, string)
   struct re_pattern_buffer *bufp;
   int len = strlen (string);
 
+  re_match_object = Qt;
   bufp = compile_pattern (regexp, 0,
                          XCHAR_TABLE (Vascii_downcase_table)->contents, 0);
   immediate_quit = 1;
@@ -1678,7 +1679,7 @@ since only regular expressions have distinguished subexpressions.")
   newpoint = PT;
 
   /* Put point back where it was in the text.  */
-  if (opoint < 0)
+  if (opoint <= 0)
     temp_set_point (opoint + ZV, current_buffer);
   else
     temp_set_point (opoint, current_buffer);