Merge pull request #67 from tmhedberg/master

Option to disable delimitMate in all buffers by default

autoload/delimitMate.vim

@@ -387,7 +387,7 @@ function! delimitMate#ExpandReturn() "{{{
 		" Expand:
 		call delimitMate#FlushBuffer()
 		"return "\<Esc>a\<CR>x\<CR>\<Esc>k$\"_xa"
-		return "\<CR>\<UP>\<Esc>o"
+		return "\<Esc>a\<CR>\<UP>\<Esc>o"
 	else
 		return "\<CR>"
 	endif

doc/delimitMate.txt

@@ -128,6 +128,15 @@ e.g.: >
         let loaded_delimitMate = 1
         au FileType mail let b:loaded_delimitMate = 1
 <
+------------------------------------------------------------------------------
+                                                  *'delimitMate_offByDefault'*
+Values: 0 or 1.~
+Default: 0~
+
+If this option is set to 1, delimitMate will load, but will not take
+effect in any buffer unless |:DelimitMateSwitch| is called in that
+buffer.
+
 ------------------------------------------------------------------------------
                                                      *'delimitMate_autoclose'*
                                                    *'b:delimitMate_autoclose'*

plugin/delimitMate.vim

@@ -237,7 +237,9 @@ function! s:DelimitMateDo(...) "{{{
 	call s:init()
 
 	" Now, add magic:
-	call s:Map()
+	if !exists("g:delimitMate_offByDefault") || !g:delimitMate_offByDefault
+		call s:Map()
+	endif
 
 	if a:0 > 0
 		echo "delimitMate has been reset."