diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 7 |
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 @@ 2011-08-25 Juri Linkov <juri@jurta.org> + * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to + `search-whitespace-regexp' (bug#9364). + +2011-08-25 Juri Linkov <juri@jurta.org> + * 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 12529857a2c..8764952dbf5 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" ()) |