(UNEXEC): Definition deleted.

[gnu-emacs] / src / search.c

diff --git a/src/search.c b/src/search.c
index 7ccdab568e1dbfce61db27c240d5f57e96b30a84..f795eb40abe58b194766652eb5fc8960813df465 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -212,9 +212,9 @@ compile_pattern (pattern, regp, translate, posix, multibyte)
       cp = *cpp;
       /* Entries are initialized to nil, and may be set to nil by
         compile_pattern_1 if the pattern isn't valid.  Don't apply
-        XSTRING in those cases.  However, compile_pattern_1 is only
-        applied to the cache entry we pick here to reuse.  So nil
-        should never appear before a non-nil entry.  */
+        string accessors in those cases.  However, compile_pattern_1
+        is only applied to the cache entry we pick here to reuse.  So
+        nil should never appear before a non-nil entry.  */
       if (NILP (cp->regexp))
        goto compile_it;
       if (SCHARS (cp->regexp) == SCHARS (pattern)
@@ -473,7 +473,7 @@ extern Lisp_Object Vascii_downcase_table;
 int
 fast_c_string_match_ignore_case (regexp, string)
      Lisp_Object regexp;
-     char *string;
+     const char *string;
 {
   int val;
   struct re_pattern_buffer *bufp;
@@ -1994,7 +1994,7 @@ wordify (string)
 
       if (SYNTAX (c) == Sword)
        {
-         bcopy (&SREF (string, i_byte_orig), o,
+         bcopy (SDATA (string) + i_byte_orig, o,
                 i_byte - i_byte_orig);
          o += i_byte - i_byte_orig;
        }
@@ -2471,7 +2471,7 @@ since only regular expressions have distinguished subexpressions.  */)
          else
            {
              /* Note that we don't have to increment POS.  */
-             c = SDATA (newtext)[pos_byte++];
+             c = SREF (newtext, pos_byte++);
              if (buf_multibyte)
                c = unibyte_char_to_multibyte (c);
            }