Mercurial > emacs
diff src/search.c @ 112434:9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 22 Jan 2011 18:56:06 -0800 |
| parents | 42e22c4f06b7 |
| children |
line wrap: on
line diff
--- a/src/search.c Sat Jan 22 17:09:09 2011 -0800 +++ b/src/search.c Sat Jan 22 18:56:06 2011 -0800 @@ -153,7 +153,7 @@ else re_set_whitespace_regexp (NULL); - val = (char *) re_compile_pattern ((char *) SDATA (pattern), + val = (char *) re_compile_pattern (SSDATA (pattern), SBYTES (pattern), &cp->buf); /* If the compiled pattern hard codes some of the contents of the @@ -414,7 +414,7 @@ immediate_quit = 1; re_match_object = string; - val = re_search (bufp, (char *) SDATA (string), + val = re_search (bufp, SSDATA (string), SBYTES (string), pos_byte, SBYTES (string) - pos_byte, (NILP (Vinhibit_changing_match_data) @@ -485,7 +485,7 @@ immediate_quit = 1; re_match_object = string; - val = re_search (bufp, (char *) SDATA (string), + val = re_search (bufp, SSDATA (string), SBYTES (string), 0, SBYTES (string), 0); immediate_quit = 0; @@ -528,7 +528,7 @@ immediate_quit = 1; re_match_object = string; - val = re_search (bufp, (char *) SDATA (string), + val = re_search (bufp, SSDATA (string), SBYTES (string), 0, SBYTES (string), 0); immediate_quit = 0; @@ -1268,7 +1268,7 @@ if (multibyte == STRING_MULTIBYTE (string)) { - raw_pattern = (unsigned char *) SDATA (string); + raw_pattern = SDATA (string); raw_pattern_size = SCHARS (string); raw_pattern_size_byte = SBYTES (string); } @@ -3254,4 +3254,3 @@ defsubr (&Sset_match_data); defsubr (&Sregexp_quote); } -