* lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to

`search-whitespace-regexp' only when `isearch-regexp' is non-nil.

Fixes: debbugs:9364

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 264a4e8a7e8aa14b4546b76450f4bcd2b3287c12..b20ebccea89040f81bd974cda35b4471b1828742 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-24  Juri Linkov  <juri@jurta.org>
+
+       * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
+       `search-whitespace-regexp' only when `isearch-regexp' is non-nil.
+       (Bug#9364)
+
 2011-10-24  Juri Linkov  <juri@jurta.org>
 
        * info.el (Info-following-node-name-re): Add newline to the list

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6cfcce59672e22d6430fb3e303ee90e39d68df57..6bb23916da316fe43cee31c738678d369db4ec81 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1452,7 +1452,7 @@ string.  NLINES has the same meaning as in `occur'."
        ;; Set `search-upper-case' to nil to not call
        ;; `isearch-no-upper-case-p' in `occur-1'.
        (search-upper-case nil)
-       (search-spaces-regexp search-whitespace-regexp))
+       (search-spaces-regexp (if isearch-regexp search-whitespace-regexp)))
     (occur regexp nlines)))
 
 (declare-function hi-lock-read-face-name "hi-lock" ())