# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1100894859 0
# Node ID a945a6396351f4b1caba1b284fd255bfb2d11b40
# Parent  c11ef32aabb76e7cc5d3da9314d7b933e38bbe7e
*** empty log message ***

diff -r c11ef32aabb7 -r a945a6396351 etc/NEWS
--- a/etc/NEWS	Fri Nov 19 20:04:44 2004 +0000
+++ b/etc/NEWS	Fri Nov 19 20:07:39 2004 +0000
@@ -98,6 +98,15 @@
 
 * 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 -r c11ef32aabb7 -r a945a6396351 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 19 20:04:44 2004 +0000
+++ b/lisp/ChangeLog	Fri Nov 19 20:07:39 2004 +0000
@@ -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 -r c11ef32aabb7 -r a945a6396351 lispref/ChangeLog
--- a/lispref/ChangeLog	Fri Nov 19 20:04:44 2004 +0000
+++ b/lispref/ChangeLog	Fri Nov 19 20:07:39 2004 +0000
@@ -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 -r c11ef32aabb7 -r a945a6396351 src/ChangeLog
--- a/src/ChangeLog	Fri Nov 19 20:04:44 2004 +0000
+++ b/src/ChangeLog	Fri Nov 19 20:07:39 2004 +0000
@@ -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.