From d8c852509f6218db43e5f2ca8baace02d4fa1294 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 5 Apr 2008 21:40:16 +0000 Subject: [PATCH] (compile_pattern_1): Treat non-nil and non-string of search-spaces-regexp as nil. --- src/search.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/search.c b/src/search.c index 56bf47571e1..96daecb728e 100644 --- a/src/search.c +++ b/src/search.c @@ -141,7 +141,11 @@ compile_pattern_1 (cp, pattern, translate, regp, posix) cp->posix = posix; cp->buf.multibyte = STRING_MULTIBYTE (pattern); cp->buf.charset_unibyte = charset_unibyte; - cp->whitespace_regexp = Vsearch_spaces_regexp; + if (STRINGP (Vsearch_spaces_regexp)) + cp->whitespace_regexp = Vsearch_spaces_regexp; + else + cp->whitespace_regexp = Qnil; + /* rms: I think BLOCK_INPUT is not needed here any more, because regex.c defines malloc to call xmalloc. Using BLOCK_INPUT here means the debugger won't run if an error occurs. @@ -149,8 +153,11 @@ compile_pattern_1 (cp, pattern, translate, regp, posix) /* BLOCK_INPUT; */ old = re_set_syntax (RE_SYNTAX_EMACS | (posix ? 0 : RE_NO_POSIX_BACKTRACKING)); - re_set_whitespace_regexp (NILP (Vsearch_spaces_regexp) ? NULL - : SDATA (Vsearch_spaces_regexp)); + + if (STRINGP (Vsearch_spaces_regexp)) + re_set_whitespace_regexp (SDATA (Vsearch_spaces_regexp)); + else + re_set_whitespace_regexp (NULL); val = (char *) re_compile_pattern ((char *) SDATA (pattern), SBYTES (pattern), &cp->buf); -- 2.11.4.GIT