From: Juri Linkov <juri@jurta.org>
Date: Tue, 11 Nov 2008 19:43:09 +0000 (+0000)
Subject: (isearch-search-fun): Compare the length of the
X-Git-Tag: emacs-pretest-23.0.90~1884
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c740e4c10912a048e0d02aeb0b78e4579d39fb6;p=emacs.git

(isearch-search-fun): Compare the length of the
current search string with the length of the string from the
previous search state to detect the situation when the user
adds or removes characters in the search string.
Use word-search-forward-lax and word-search-backward-lax in this
case, and otherwise word-search-forward and word-search-backward.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 525106246d4..ac911de3ffb 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2178,7 +2178,12 @@ Can be changed via `isearch-search-fun-function' for special needs."
       (funcall isearch-search-fun-function)
     (cond
      (isearch-word
-      (if isearch-forward 'word-search-forward-lax 'word-search-backward-lax))
+      ;; Use lax versions to not fail at the end of the word while the user
+      ;; adds and removes characters in the search string
+      (if (not (eq (length isearch-string)
+		   (length (isearch-string-state (car isearch-cmds)))))
+	  (if isearch-forward 'word-search-forward-lax 'word-search-backward-lax)
+	(if isearch-forward 'word-search-forward 'word-search-backward)))
      (isearch-regexp
       (if isearch-forward 're-search-forward 're-search-backward))
      (t