From: Juri Linkov <juri@jurta.org>
Date: Mon, 24 Oct 2011 05:56:04 +0000 (+0300)
Subject: * lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
X-Git-Tag: emacs-pretest-24.0.91~37^2~1^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8;p=emacs.git

* 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 264a4e8a7e8..b20ebccea89 100644
--- 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 6cfcce59672..6bb23916da3 100644
--- 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" ())