aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov <[email protected]>2011-08-25 23:48:45 +0300
committerJuri Linkov <[email protected]>2011-08-25 23:48:45 +0300
commit3e8cd5ce9547c4482aca2a46a30a6d1a19e137c4 (patch)
treebdc7023592e67cf2a65c9b7dcd0ba904e98a22f3
parent93eb7113267c5b51904d36084f9a61b7c75313e4 (diff)
* lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
`search-whitespace-regexp'. Fixes: debbugs:9364
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/isearch.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1d04b8c1b..b922e21681 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2011-08-25 Juri Linkov <[email protected]>
+ * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
+ `search-whitespace-regexp' (bug#9364).
+
+2011-08-25 Juri Linkov <[email protected]>
+
* isearch.el (isearch-edit-string): Let-bind `search-ring' and
`regexp-search-ring' to their global values to protect from
updating by `read-from-minibuffer' (bug#9185).
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 12529857a2..8764952dbf 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1445,9 +1445,10 @@ string. NLINES has the same meaning as in `occur'."
(t (regexp-quote isearch-string)))
(if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
(let ((case-fold-search isearch-case-fold-search)
- ;; set `search-upper-case' to nil to not call
- ;; `isearch-no-upper-case-p' in `occur-1'
- (search-upper-case nil))
+ ;; 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))
(occur regexp nlines)))
(declare-function hi-lock-read-face-name "hi-lock" ())