summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2015-08-09 09:56:33 +0100
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-08-09 09:57:05 +0100
commita5bdb872edb9f031fe041faf9a8c0be432e5f64c (patch)
treedca1015039dc124e41056d39b488020382efffc5 /lisp/isearch.el
parent7e8f7e089f3e72644c9a6e0d022d51d3166bbb07 (diff)
downloademacs-a5bdb872edb9f031fe041faf9a8c0be432e5f64c.tar.gz
* isearch.el (isearch-search-fun-default): (Bug#21164)
Respect `isearch-lax-whitespace' when searching through `isearch-word'.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 8d4bf24c6fb..2d2f0ee2495 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2607,11 +2607,12 @@ Can be changed via `isearch-search-fun-function' for special needs."
;; Use lax versions to not fail at the end of the word while
;; the user adds and removes characters in the search string
;; (or when using nonincremental word isearch)
- (let ((lax (not (or isearch-nonincremental
- (null (car isearch-cmds))
- (eq (length isearch-string)
- (length (isearch--state-string
- (car isearch-cmds))))))))
+ (let ((lax (or isearch-lax-whitespace
+ (not (or isearch-nonincremental
+ (null (car isearch-cmds))
+ (eq (length isearch-string)
+ (length (isearch--state-string
+ (car isearch-cmds)))))))))
(funcall
(if isearch-forward #'re-search-forward #'re-search-backward)
(if (functionp isearch-word)