2015-06-24: merge

merge

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,4 @@ 8eaf023f5d3bc20ad4b795cde3a92e3b5c242dba
 327acbae68ef4efbf77734f0ee20359ed559ce0d v0.8.2
 41c48043ca33bf47311a93d0545b13a0578c3cf0 v0.8.3
 a4bca2a0f2f6659d97b1db471ae9803119b80529 v0.8.4
+f0096bf5f3baee5017be94f49c70515fe2a535b3 wisp-mode-0.2.1
diff --git a/docs/srfi-from-template.html b/docs/srfi-from-template.html
--- a/docs/srfi-from-template.html
+++ b/docs/srfi-from-template.html
@@ -33,7 +33,7 @@ subscribe to the list.  You can access p
     href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-119/srfi-119.html?rev=1.1">2015/01/25</a></li>
       <li>Draft: 2015/02/03-2015/04/03</li>
     <li>Revised: <a
-    href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-119/srfi-119.html?rev=1.2">2015/03/12</a></li>
+    href="http://srfi.schemers.org/cgi-bin/viewcvs.cgi/*checkout*/srfi/srfi-119/srfi-119.html?rev=1.2">2015/06/23</a></li>
 </ul>
 
 
@@ -60,7 +60,7 @@ It resolves a limitation of <a href="htt
 </p>
 
 <p>
-Wisp expressions can include any s-expressions and as such provide backwards compatibility.
+Wisp expressions can include arbitrary s-expressions and as such provide backwards compatibility.
 </p>
 
 <blockquote>
diff --git a/wisp-mode.el b/wisp-mode.el
--- a/wisp-mode.el
+++ b/wisp-mode.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2013  Arne Babenhauserheide <arne_bab@web.de>
 
 ;; Author: Arne Babenhauserheide <arne_bab@web.de>
-;; Version: 0.2
+;; Version: 0.2.1
 ;; Keywords: languages, lisp
 
 ;; This program is free software; you can redistribute it and/or
@@ -37,6 +37,7 @@
 ;; 
 ;; ChangeLog:
 ;; 
+;;  - 0.2.1: Disable electric-indent-local-mode in wisp-mode buffers.
 ;;  - 0.2: Fixed the regular expressions. Now org-mode HTML export works with wisp-code.
 ;; 
 ;;; Code: