diff options
| author | Juri Linkov <juri@jurta.org> | 2011-10-24 08:56:04 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-10-24 08:56:04 +0300 |
| commit | db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8 (patch) | |
| tree | e5e1b58f9010d0a042f0bfede9401f90ae1d9563 /lisp | |
| parent | feecf43567ca35641042bbec8e4d67ba64577360 (diff) | |
| download | emacs-db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8.tar.gz emacs-db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8.tar.bz2 emacs-db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8.zip | |
* lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
`search-whitespace-regexp' only when `isearch-regexp' is non-nil.
Fixes: debbugs:9364
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/isearch.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 264a4e8a7e8..b20ebccea89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 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 of allowed characters for leading space. (Bug#9824) 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" ()) |