diff options
| author | Frank Fischer <frank-fischer@shadow-soft.de> | 2016-04-05 07:19:48 +0200 |
|---|---|---|
| committer | Frank Fischer <frank-fischer@shadow-soft.de> | 2016-04-05 07:19:48 +0200 |
| commit | 61dd1b450557845c840be35f3ba138e78a45f879 (patch) | |
| tree | 06f89d2790cb8042e50dac87cc0310ec38485a66 /evil-search.el | |
| parent | 94aaa5fb9b588bdbfaea35c20e7b8b1c9ba3b604 (diff) | |
| parent | c22d5b0f09727ca9f5bdc8d3c69d8f6458642666 (diff) | |
Merge stable
Diffstat (limited to 'evil-search.el')
| -rw-r--r-- | evil-search.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/evil-search.el b/evil-search.el index 5897d20..db5c604 100644 --- a/evil-search.el +++ b/evil-search.el @@ -3,7 +3,7 @@ ;; Author: Vegard Øye <vegard_oye at hotmail.com> ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com> -;; Version: 1.2.11 +;; Version: 1.2.12 ;; ;; This file is NOT part of GNU Emacs. @@ -770,7 +770,7 @@ the direcion is determined by `evil-ex-search-direction'." ;; maybe skip end-of-line (when (and evil-move-cursor-back (eolp) (not (eobp))) (forward-char))) - (let ((res (evil-ex-find-next))) + (let ((res (evil-ex-find-next nil nil (not evil-search-wrap)))) (cond ((not res) (goto-char orig) @@ -940,7 +940,8 @@ any error conditions." (throw 'done (list 'empty-pattern pat offset))) (let (search-result) (while (> count 0) - (let ((result (evil-ex-find-next pat direction))) + (let ((result (evil-ex-find-next pat direction + (not evil-search-wrap)))) (if (not result) (setq search-result nil count 0) (setq search-result (if (or (eq result 'wrap) |