diff options
| author | Juri Linkov <juri@jurta.org> | 2013-02-02 01:38:41 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2013-02-02 01:38:41 +0200 |
| commit | dc2bc29527d65f54704570c991e023cbb0723544 (patch) | |
| tree | 2096e5aab561b99ed282243946041ba2fa9d9174 /lisp/isearch.el | |
| parent | f864e0ea838f8f5e1a27b2ac612d0072c1606507 (diff) | |
| download | emacs-dc2bc29527d65f54704570c991e023cbb0723544.tar.gz | |
* lisp/replace.el (perform-replace): Move let-bindings of isearch-*
variables deeper to the loop that searches for the next match.
Add bindings for `isearch-nonincremental' and `isearch-adjusted'.
Use `isearch-search-fun-default' instead of `isearch-search-fun'.
* lisp/isearch.el (isearch-search-fun-default): Check for null
first element of isearch-cmds as a precaution when it's used
with inactive isearch.
Fixes: debbugs:13579
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index e8bcf7679ae..972fb0058d3 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2495,6 +2495,7 @@ Can be changed via `isearch-search-fun-function' for special needs." ;; 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)))))))) |