From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sun, 9 Aug 2015 08:56:33 +0000 (+0100)
Subject: * isearch.el (isearch-search-fun-default): (Bug#21164)
X-Git-Tag: emacs-25.0.90~1373^2~83
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5bdb872edb9f031fe041faf9a8c0be432e5f64c;p=emacs.git

* isearch.el (isearch-search-fun-default): (Bug#21164)

Respect `isearch-lax-whitespace' when searching through
`isearch-word'.
---

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)