Mercurial > emacs

changeset 58331:c11ef32aabb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Info-search): Use search-whitespace-regexp.
author Richard M. Stallman <rms@gnu.org>
date Fri, 19 Nov 2004 20:04:44 +0000
parents 5be8a633ec57
children a945a6396351
files lisp/info.el
diffstat 1 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/info.el	Fri Nov 19 20:02:32 2004 +0000
+++ b/lisp/info.el	Fri Nov 19 20:04:44 2004 +0000
@@ -1468,10 +1468,6 @@
 	  (opoint-max (point-max))
 	  (ostart (window-start))
 	  (osubfile Info-current-subfile))
-      (when Info-search-whitespace-regexp
-        (setq regexp
-              (mapconcat 'identity (split-string regexp "[ \t\n]+")
-                         Info-search-whitespace-regexp)))
       (setq Info-search-case-fold case-fold-search)
       (save-excursion
 	(save-restriction
@@ -1496,12 +1492,14 @@
 			    (save-excursion
 			      (and (search-backward "\^_" nil t)
 				   (looking-at "\^_\nTag Table"))))))
-	    (if (if backward
-                    (re-search-backward regexp bound t)
-                  (re-search-forward regexp bound t))
-		(setq found (point) beg-found (if backward (match-end 0)
-                                                (match-beginning 0)))
-	      (setq give-up t)))))
+	    (let ((search-whitespace-regexp
+		   Info-search-whitespace-regexp))
+	      (if (if backward
+		      (re-search-backward regexp bound t)
+		    (re-search-forward regexp bound t))
+		  (setq found (point) beg-found (if backward (match-end 0)
+						  (match-beginning 0)))
+		(setq give-up t))))))
       ;; If no subfiles, give error now.
       (if give-up
 	  (if (null Info-current-subfile)