*** empty log message ***

4 files changed, 21 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 0c412e115bc..aa8cbe932a3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -98,6 +98,15 @@ types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 
 * Changes in Emacs 21.4
 
++++
+** The new variable search-whitespace-regexp controls how to search
+for spaces in a regular expression.  If it is non-nil, it should be a
+regular expression, and any series of spaces stands for that regular
+expression.  If it is nil, spaces stand for themselves.
+
+Spaces inside of constructs such as [..] and *, +, ? are never
+replaced with search-whitespace-regexp.
+
 ** line-move-ignore-invisible now defaults to t.
 
 ** In Outline mode, hide-body no longer hides lines at the top
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 060232490c2..652ab2c3b3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-19  Richard M. Stallman  <rms@gnu.org>
+
+        * info.el (Info-search): Use search-whitespace-regexp.
+
 2004-11-19  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * vc-rcs.el (vc-rcs-parse): New function.
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 319cb87a097..295b8317534 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-19  Richard M. Stallman  <rms@gnu.org>
+
+        * searching.texi (Regexp Search): Add search-whitespace-regexp.
+
 2004-11-19  CHENG Gao  <chenggao@gmail.com>  (tiny change)
 
         * tips.texi (Coding Conventions): Fix typo.
diff --git a/src/ChangeLog b/src/ChangeLog
index dda9d1cc972..395872b1e44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,10 @@
         (compile_pattern_1): Call re_set_whitespace_regexp with it.
         (search_buffer): No regexp is trivial if Vsearch_whitespace_regexp
         is non-nil.
+        (struct regexp_cache): New element whitespace_regexp.
+        (syms_of_search): Initialize whitespace_regexp elements.
+        (compile_pattern): Compare whitespace_regexp elements.
+        (compile_pattern_1): Set whitespace_regexp elements.
 
         * regex.c (regex_compile): Substitute whitespace_regexp
         for spaces, if it is nonzero.