# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1140730901 0
# Node ID ab159a9e1d0aa9941d29e88c2851e9bc73f32f7b
# Parent  a7ce66a8df73cd9fe10f764b97b3d23b19626306
(Info-search): Don't bind search-spaces-regexp to
Info-search-whitespace-regexp in non-regexp isearch mode.

diff -r a7ce66a8df73 -r ab159a9e1d0a lisp/info.el
--- a/lisp/info.el	Thu Feb 23 21:41:26 2006 +0000
+++ b/lisp/info.el	Thu Feb 23 21:41:41 2006 +0000
@@ -1642,7 +1642,9 @@
 			      (and (search-backward "\^_" nil t)
 				   (looking-at
 				    "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
-	    (let ((search-spaces-regexp Info-search-whitespace-regexp))
+	    (let ((search-spaces-regexp
+		   (if (or (not isearch-mode) isearch-regexp)
+		       Info-search-whitespace-regexp)))
 	      (if (if backward
 		      (re-search-backward regexp bound t)
 		    (re-search-forward regexp bound t))
@@ -1660,7 +1662,9 @@
       ;; If no subfiles, give error now.
       (if give-up
 	  (if (null Info-current-subfile)
-	      (let ((search-spaces-regexp Info-search-whitespace-regexp))
+	      (let ((search-spaces-regexp
+		     (if (or (not isearch-mode) isearch-regexp)
+			 Info-search-whitespace-regexp)))
 		(if backward
 		    (re-search-backward regexp)
 		  (re-search-forward regexp)))
@@ -1731,7 +1735,9 @@
 				    (and (search-backward "\^_" nil t)
 					 (looking-at
 					  "\^_\n\\(Tag Table\\|Local Variables\\)"))))))
-		  (let ((search-spaces-regexp Info-search-whitespace-regexp))
+		  (let ((search-spaces-regexp
+			 (if (or (not isearch-mode) isearch-regexp)
+			     Info-search-whitespace-regexp)))
 		    (if (if backward
 			    (re-search-backward regexp nil t)
 			  (re-search-forward regexp nil t))