mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-02 05:32:08 -08:00
Code Issues Projects Releases Wiki Activity

* isearch.el (isearch-search-fun-default): Revert a5bdb87

Browse source 
Remove usage of `isearch-lax-whitespace' inside the `iearch-word'
clause of `isearch-search-fun-default'. That lax variable does not
refer to lax-whitespacing.  Related to (bug#21777).
This reverts commit a5bdb872ed.

* character-fold.el (character-fold-search): Set to nil
Default to nil for now, until someone implements proper
lax-whitespacing with char-fold searching.
This commit is contained in:
Artur Malabarba 2015-08-19 11:43:29 +01:00
parent 7047d3642f
commit 7eed739935
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/character-fold.el
View file

@ -24,7 +24,7 @@
;;;###autoload
(defvar character-fold-search t
(defvar character-fold-search nil
"Non-nil if searches should fold similar characters.
This means some characters will match entire groups of characters.
For instance, \" will match all variants of double quotes, and

11
lisp/isearch.el
View file

@ -2607,12 +2607,11 @@ 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 (or isearch-lax-whitespace
(not (or isearch-nonincremental
(null (car isearch-cmds))
(eq (length isearch-string)
(length (isearch--state-string
(car isearch-cmds)))))))))
(let ((lax (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)