[Emacs-diffs] Changes to emacs/lisp/info.el

[Juri Linkov]

Index: emacs/lisp/info.el
diff -u emacs/lisp/info.el:1.479 emacs/lisp/info.el:1.480
--- emacs/lisp/info.el:1.479    Fri Feb 17 21:55:10 2006
+++ emacs/lisp/info.el  Thu Feb 23 21:41:41 2006
@@ -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))