aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov2011-10-24 08:56:04 +0300
committerJuri Linkov2011-10-24 08:56:04 +0300
commitdb2440b6ccf1a9c098d2c00ef4218a1542f8c8f8 (patch)
treee5e1b58f9010d0a042f0bfede9401f90ae1d9563 /lisp
parentfeecf43567ca35641042bbec8e4d67ba64577360 (diff)
downloademacs-db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8.tar.gz
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/ChangeLog6
-rw-r--r--lisp/isearch.el2
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 @@
12011-10-24 Juri Linkov <juri@jurta.org> 12011-10-24 Juri Linkov <juri@jurta.org>
2 2
3 * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
4 `search-whitespace-regexp' only when `isearch-regexp' is non-nil.
5 (Bug#9364)
6
72011-10-24 Juri Linkov <juri@jurta.org>
8
3 * info.el (Info-following-node-name-re): Add newline to the list 9 * info.el (Info-following-node-name-re): Add newline to the list
4 of allowed characters for leading space. (Bug#9824) 10 of allowed characters for leading space. (Bug#9824)
5 11
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'."
1452 ;; Set `search-upper-case' to nil to not call 1452 ;; Set `search-upper-case' to nil to not call
1453 ;; `isearch-no-upper-case-p' in `occur-1'. 1453 ;; `isearch-no-upper-case-p' in `occur-1'.
1454 (search-upper-case nil) 1454 (search-upper-case nil)
1455 (search-spaces-regexp search-whitespace-regexp)) 1455 (search-spaces-regexp (if isearch-regexp search-whitespace-regexp)))
1456 (occur regexp nlines))) 1456 (occur regexp nlines)))
1457 1457
1458(declare-function hi-lock-read-face-name "hi-lock" ()) 1458(declare-function hi-lock-read-face-name "hi-lock" ())