aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-08-25 23:48:45 +0300
committerJuri Linkov2011-08-25 23:48:45 +0300
commit3e8cd5ce9547c4482aca2a46a30a6d1a19e137c4 (patch)
treebdc7023592e67cf2a65c9b7dcd0ba904e98a22f3
parent93eb7113267c5b51904d36084f9a61b7c75313e4 (diff)
downloademacs-3e8cd5ce9547c4482aca2a46a30a6d1a19e137c4.tar.gz
emacs-3e8cd5ce9547c4482aca2a46a30a6d1a19e137c4.zip
* 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 b1d04b8c1b6..b922e21681f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12011-08-25 Juri Linkov <juri@jurta.org> 12011-08-25 Juri Linkov <juri@jurta.org>
2 2
3 * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
4 `search-whitespace-regexp' (bug#9364).
5
62011-08-25 Juri Linkov <juri@jurta.org>
7
3 * isearch.el (isearch-edit-string): Let-bind `search-ring' and 8 * isearch.el (isearch-edit-string): Let-bind `search-ring' and
4 `regexp-search-ring' to their global values to protect from 9 `regexp-search-ring' to their global values to protect from
5 updating by `read-from-minibuffer' (bug#9185). 10 updating by `read-from-minibuffer' (bug#9185).
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 12529857a2c..8764952dbf5 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1445,9 +1445,10 @@ string. NLINES has the same meaning as in `occur'."
1445 (t (regexp-quote isearch-string))) 1445 (t (regexp-quote isearch-string)))
1446 (if current-prefix-arg (prefix-numeric-value current-prefix-arg)))) 1446 (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
1447 (let ((case-fold-search isearch-case-fold-search) 1447 (let ((case-fold-search isearch-case-fold-search)
1448 ;; set `search-upper-case' to nil to not call 1448 ;; Set `search-upper-case' to nil to not call
1449 ;; `isearch-no-upper-case-p' in `occur-1' 1449 ;; `isearch-no-upper-case-p' in `occur-1'.
1450 (search-upper-case nil)) 1450 (search-upper-case nil)
1451 (search-spaces-regexp search-whitespace-regexp))
1451 (occur regexp nlines))) 1452 (occur regexp nlines)))
1452 1453
1453(declare-function hi-lock-read-face-name "hi-lock" ()) 1454(declare-function hi-lock-read-face-name "hi-lock" ())