masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 19:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Respect `isearch-lax-whitespace' when searching through
`isearch-word'.
This commit is contained in:
Artur Malabarba 2015-08-09 09:56:33 +01:00
parent 7e8f7e089f
commit a5bdb872ed
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/isearch.el
View file

@ -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 ;; Use lax versions to not fail at the end of the word while
;; the user adds and removes characters in the search string ;; the user adds and removes characters in the search string
;; (or when using nonincremental word isearch) ;; (or when using nonincremental word isearch)
(let ((lax (not (or isearch-nonincremental (let ((lax (or isearch-lax-whitespace
(null (car isearch-cmds)) (not (or isearch-nonincremental
(eq (length isearch-string) (null (car isearch-cmds))
(length (isearch--state-string (eq (length isearch-string)
(car isearch-cmds)))))))) (length (isearch--state-string
(car isearch-cmds)))))))))
(funcall (funcall
(if isearch-forward #'re-search-forward #'re-search-backward) (if isearch-forward #'re-search-forward #'re-search-backward)
(if (functionp isearch-word) (if (functionp isearch-word)