[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7eed739: * isearch.el (isearch-search-fun-default):
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] master 7eed739: * isearch.el (isearch-search-fun-default): Revert a5bdb87 |
Date: |
Wed, 19 Aug 2015 10:47:02 +0000 |
branch: master
commit 7eed7399358faecd719febae4dc720ef2be41155
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
* isearch.el (isearch-search-fun-default): Revert a5bdb87
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 a5bdb872edb9f031fe041faf9a8c0be432e5f64c.
* character-fold.el (character-fold-search): Set to nil
Default to nil for now, until someone implements proper
lax-whitespacing with char-fold searching.
---
lisp/character-fold.el | 2 +-
lisp/isearch.el | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/lisp/character-fold.el b/lisp/character-fold.el
index 6bbb3ec..988a506 100644
--- a/lisp/character-fold.el
+++ b/lisp/character-fold.el
@@ -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
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 2d2f0ee..8d4bf24 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7eed739: * isearch.el (isearch-search-fun-default): Revert a5bdb87,
Artur Malabarba <=