Merge stable

17 files changed, 23 insertions, 19 deletions

diff --git a/evil-command-window.el b/evil-command-window.el
index 6275c37..5278f5b 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-commands.el b/evil-commands.el
index 6f9a75e..401c6bb 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-common.el b/evil-common.el
index 94182bf..ef279eb 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-core.el b/evil-core.el
index 77a758e..4cf9009 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -113,7 +113,11 @@
   "Minor mode for setting up Evil in a single buffer."
   :init-value nil
   (cond
-   ((evil-disabled-buffer-p))
+   ((evil-disabled-buffer-p)
+    ;; Don't leave the mode variable on in buffers where evil disabled, because
+    ;; functions that check this variable will get an incorrect result (e.g.,
+    ;; evil-refresh-cursor).
+    (setq evil-local-mode nil))
    (evil-local-mode
     (setq emulation-mode-map-alists
           (evil-concat-lists '(evil-mode-map-alist)
diff --git a/evil-digraphs.el b/evil-digraphs.el
index 30aae9b..558c80a 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-ex.el b/evil-ex.el
index de3f8dc..1d3fc03 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-integration.el b/evil-integration.el
index 3b1164c..24f3d2e 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-macros.el b/evil-macros.el
index 5e27903..32a4016 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-maps.el b/evil-maps.el
index 184942a..b43c110 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-pkg.el b/evil-pkg.el
index a6bbf4d..0b26754 100644
--- a/evil-pkg.el
+++ b/evil-pkg.el
@@ -1,6 +1,6 @@
 (define-package
   "evil"
-  "1.2.8"
+  "1.2.9"
   "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 7432862..d423713 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-search.el b/evil-search.el
index fca19b5..1b481ea 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-states.el b/evil-states.el
index a978a08..837b8c0 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-tests.el b/evil-tests.el
index 5f253ba..a0b95b7 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-types.el b/evil-types.el
index e63b500..7a030ed 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-vars.el b/evil-vars.el
index 9e8c49c..87fa511 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.8
+;; Version: 1.2.9
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -1756,7 +1756,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.8")))))
+         (t "1.2.9")))))
   "The current version of Evil")
 
 (defun evil-version ()
diff --git a/evil.el b/evil.el
index 24ea6b1..53d62e6 100644
--- a/evil.el
+++ b/evil.el
@@ -48,7 +48,7 @@
 ;;      To get in touch, please use the bug tracker or the
 ;;      mailing list (see below).
 ;; Created: 2011-03-01
-;; Version: 1.2.8
+;; Version: 1.2.9
 ;; Keywords: emulation, vim
 ;; URL: http://gitorious.org/evil
 ;;      Repository: git://gitorious.org/evil/evil.git