Merge stable

18 files changed, 36 insertions, 33 deletions

diff --git a/evil-command-window.el b/evil-command-window.el
index 5278f5b..e92c0c4 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-commands.el b/evil-commands.el
index 401c6bb..330a4b2 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-common.el b/evil-common.el
index ef279eb..1b86e17 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-core.el b/evil-core.el
index 3ccaac3..dce2f8e 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-digraphs.el b/evil-digraphs.el
index 558c80a..3894605 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-ex.el b/evil-ex.el
index 1d3fc03..160df05 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-integration.el b/evil-integration.el
index 24f3d2e..b046842 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-macros.el b/evil-macros.el
index 32a4016..38d1934 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-maps.el b/evil-maps.el
index b43c110..a722720 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-pkg.el b/evil-pkg.el
index 0b26754..7482956 100644
--- a/evil-pkg.el
+++ b/evil-pkg.el
@@ -1,6 +1,6 @@
 (define-package
   "evil"
-  "1.2.9"
+  "1.2.10"
   "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 d423713..e853348 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-search.el b/evil-search.el
index 1b481ea..d66f990 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-states.el b/evil-states.el
index 837b8c0..868e64b 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-tests.el b/evil-tests.el
index a0b95b7..31893fb 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-types.el b/evil-types.el
index 7a030ed..e4397f0 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-vars.el b/evil-vars.el
index 9e1b48b..57827a9 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.9
+;; Version: 1.2.10
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -1762,7 +1762,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.9")))))
+         (t "1.2.10")))))
   "The current version of Evil")
 
 (defun evil-version ()
diff --git a/evil.el b/evil.el
index 53d62e6..e153303 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.9
+;; Version: 1.2.10
 ;; Keywords: emulation, vim
 ;; URL: http://gitorious.org/evil
 ;;      Repository: git://gitorious.org/evil/evil.git
diff --git a/scripts/evilupdate b/scripts/evilupdate
index d6fe311..265f5d5 100755
--- a/scripts/evilupdate
+++ b/scripts/evilupdate
@@ -12,7 +12,7 @@
 
 ;; The contents of this file are subject to the GPL License, Version 3.0.
 
-;; Copyright (C) 2015, Frank Fischer
+;; Copyright (C) 2015, 2016, Frank Fischer
 
 ;; This program is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 (require 'yaoddmuse)
 (eval-when-compile (require 'cl))
 
-(defconst evilupdate-irc-nick "#lyrobot")
+(defconst evilupdate-irc-nick "lyrobot")
 (defconst evilupdate-irc-channel "#evil-mode")
 (defconst evilupdate-irc-topic
   "Evil = Extensible vi layer for Emacs | Current version: VERSION | http://bitbucket.org/lyro/evil | If you don't get an answer here, please use the mailing-list implementations-list@lists.ourproject.org")
@@ -70,19 +70,22 @@
 
 (defun evilupdate-update-irc ()
   "Update the topic of the IRC channel."
-  (erc-tls :server "irc.freenode.net" :port "6697" :nick "lyrobot")
-  (add-hook 'erc-join-hook
-            (lambda ()
-              (let (case-fold-search)
-                (erc-set-topic (replace-regexp-in-string "VERSION"
-                                                         evilupdate-version
-                                                         evilupdate-irc-topic
-                                                         nil t)))
-              (erc-quit-server "")
-              (sleep-for 5)
-              (evilupdate-done)))
-  (erc-join-channel evilupdate-irc-channel)
-  (evilupdate-wait))
+  (let ((erc-nick evilupdate-irc-nick)
+        (erc-autojoin-channels-alist nil)
+        (auth-sources nil))
+    (erc-tls :server "irc.freenode.net" :port "6697" :nick evilupdate-irc-nick)
+    (add-hook 'erc-join-hook
+              (lambda ()
+                (let (case-fold-search)
+                  (erc-set-topic (replace-regexp-in-string "VERSION"
+                                                           evilupdate-version
+                                                           evilupdate-irc-topic
+                                                           nil t)))
+                (erc-quit-server "")
+                (sleep-for 5)
+                (evilupdate-done)))
+    (erc-join-channel evilupdate-irc-channel)
+    (evilupdate-wait)))
 
 (defun evilupdate-wiki-trace (page-buffer-name)
   "Callback for updating the EmacsWiki page in buffer PAGE-BUFFER-NAME."