diff options
| author | Juri Linkov <juri@jurta.org> | 2006-02-23 21:41:41 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2006-02-23 21:41:41 +0000 |
| commit | 9ca9f7f3f4754ee34dc75a5a6143937d57594815 (patch) | |
| tree | 066af27751132a16300258e786f0651596558380 /lisp/info.el | |
| parent | 9b0f7f31c0e64d83bd379931c28d982a157da5b1 (diff) | |
| download | emacs-9ca9f7f3f4754ee34dc75a5a6143937d57594815.tar.gz | |
(Info-search): Don't bind search-spaces-regexp to
Info-search-whitespace-regexp in non-regexp isearch mode.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/info.el b/lisp/info.el index e9d7f5ca2de..43ee5cabcbc 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1642,7 +1642,9 @@ If DIRECTION is `backward', search in the reverse direction." (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 DIRECTION is `backward', search in the reverse direction." ;; 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 @@ If DIRECTION is `backward', search in the reverse direction." (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)) |