Merge stable

17 files changed, 21 insertions, 20 deletions

diff --git a/evil-command-window.el b/evil-command-window.el
index 7308c61..79db2a6 100644
--- a/evil-command-window.el
+++ b/evil-command-window.el
@@ -2,7 +2,7 @@
 ;; Author: Emanuel Evans <emanuel.evans at gmail.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.
diff --git a/evil-commands.el b/evil-commands.el
index 9b0ceff..15b8a7f 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -2,7 +2,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.
diff --git a/evil-common.el b/evil-common.el
index ab9439e..aa694c2 100644
--- a/evil-common.el
+++ b/evil-common.el
@@ -2,7 +2,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.
diff --git a/evil-core.el b/evil-core.el
index 7188607..28648a0 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -2,7 +2,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.
diff --git a/evil-digraphs.el b/evil-digraphs.el
index 317fc6c..2c3c529 100644
--- a/evil-digraphs.el
+++ b/evil-digraphs.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.
diff --git a/evil-ex.el b/evil-ex.el
index ad25ed2..8749eae 100644
--- a/evil-ex.el
+++ b/evil-ex.el
@@ -3,7 +3,7 @@
 ;; Author: Frank Fischer <frank fischer at mathematik.tu-chemnitz.de>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.11
+;; Version: 1.2.12
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-integration.el b/evil-integration.el
index 572cacb..d1175a9 100644
--- a/evil-integration.el
+++ b/evil-integration.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.
diff --git a/evil-macros.el b/evil-macros.el
index e4aa8d7..13bff5c 100644
--- a/evil-macros.el
+++ b/evil-macros.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.
diff --git a/evil-maps.el b/evil-maps.el
index 9f462cb..40cb7b7 100644
--- a/evil-maps.el
+++ b/evil-maps.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.
diff --git a/evil-pkg.el b/evil-pkg.el
index e4c0752..d537191 100644
--- a/evil-pkg.el
+++ b/evil-pkg.el
@@ -1,6 +1,6 @@
 (define-package
   "evil"
-  "1.2.11"
+  "1.2.12"
   "Extensible Vi layer for Emacs."
   '((undo-tree "0.6.3")
     (goto-chg "1.6")))
diff --git a/evil-repeat.el b/evil-repeat.el
index 70b3427..25b7452 100644
--- a/evil-repeat.el
+++ b/evil-repeat.el
@@ -3,7 +3,7 @@
 ;; Author: Frank Fischer <frank.fischer at mathematik.tu-chemnitz.de>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.2.11
+;; Version: 1.2.12
 
 ;;
 ;; This file is NOT part of GNU Emacs.
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)
diff --git a/evil-states.el b/evil-states.el
index 2b9822e..2e39db4 100644
--- a/evil-states.el
+++ b/evil-states.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.
diff --git a/evil-tests.el b/evil-tests.el
index 49ca022..4dd9d7d 100644
--- a/evil-tests.el
+++ b/evil-tests.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.
diff --git a/evil-types.el b/evil-types.el
index 5aaff30..1729803 100644
--- a/evil-types.el
+++ b/evil-types.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.
diff --git a/evil-vars.el b/evil-vars.el
index 4c2ee77..19f13a3 100644
--- a/evil-vars.el
+++ b/evil-vars.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.
@@ -1798,7 +1798,7 @@ Otherwise the previous command is assumed as substitute.")
           (goto-char (point-min))
           (buffer-substring (point-min) (line-end-position)))
          ;; no repo, use plain version
-         (t "1.2.11")))))
+         (t "1.2.12")))))
   "The current version of Evil")
 
 (defun evil-version ()
diff --git a/evil.el b/evil.el
index 87c6bab..6f18340 100644
--- a/evil.el
+++ b/evil.el
@@ -52,7 +52,7 @@
 ;;      To get in touch, please use the bug tracker or the
 ;;      mailing list (see below).
 ;; Created: 2011-03-01
-;; Version: 1.2.11
+;; Version: 1.2.12
 ;; Keywords: emulation, vim
 ;; URL: http://gitorious.org/evil
 ;;      Repository: git://gitorious.org/evil/evil.git