From 28ce6213fc9e036204907e78e4ea651ebdbcf5fe Mon Sep 17 00:00:00 2001
From: Israel Chauca Fuentes <israel@chauca.net>
Date: Wed, 16 Jun 2010 01:54:58 -0500
Subject: [PATCH] Cosmetic changes.

---
 autoload/delimitMate.vim | 12 ++++++------
 doc/delimitMate.txt      |  4 ++--
 plugin/delimitMate.vim   | 12 +++++++++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index 2dec033..2fd7e45 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -34,7 +34,7 @@ function! delimitMate#option_init(name, default) "{{{
 endfunction "}}}
 
 function! delimitMate#Init() "{{{
-" Initialize variables: {{{
+" Initialize variables:
 
 	" autoclose
 	call delimitMate#option_init("autoclose", 1)
@@ -66,7 +66,7 @@ function! delimitMate#Init() "{{{
 		let b:delimitMate_expand_space = 1
 	endif
 	if exists("g:delimitMate_expand_space") && type(g:delimitMate_expand_space) == type("")
-		echom "g:delimitMate_expand_space is '".g:delimitMate_expand_space."' but it must be either 1 or 0!"
+		echom "delimitMate_expand_space is '".g:delimitMate_expand_space."' but it must be either 1 or 0!"
 		echom "Read :help 'delimitMate_expand_space' for more details."
 		unlet g:delimitMate_expand_space
 		let b:delimitMate_expand_space = 1
@@ -81,7 +81,7 @@ function! delimitMate#Init() "{{{
 		let b:delimitMate_expand_cr = 1
 	endif
 	if exists("g:delimitMate_expand_cr") && type(g:delimitMate_expand_cr) == type("")
-		echom "g:delimitMate_expand_cr is '".g:delimitMate_expand_cr."' but it must be either 1 or 0!"
+		echom "delimitMate_expand_cr is '".g:delimitMate_expand_cr."' but it must be either 1 or 0!"
 		echom "Read :help 'delimitMate_expand_cr' for more details."
 		unlet g:delimitMate_expand_cr
 		let b:delimitMate_expand_cr = 1
@@ -140,28 +140,28 @@ function! delimitMate#ShouldJump() "{{{
 	let lcol = col('$')
 	let char = getline('.')[col - 1]
 
+	" Closing delimiter on the right.
 	for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
 		if char == cdel
-			" Closing delimiter on the right.
 			return 1
 		endif
 	endfor
 
+	" Closing delimiter with space expansion.
 	let nchar = getline('.')[col]
 	if b:delimitMate_l_expand_space && char == " "
 		for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
 			if nchar == cdel
-				" Closing delimiter with space expansion.
 				return 1
 			endif
 		endfor
 	endif
 
+	" Closing delimiter with CR expansion.
 	let uchar = getline(line('.') + 1)[0]
 	if b:delimitMate_l_expand_cr && char == ""
 		for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
 			if uchar == cdel
-				" Closing delimiter with CR expansion.
 				return 1
 			endif
 		endfor
diff --git a/doc/delimitMate.txt b/doc/delimitMate.txt
index df31a28..6d49386 100644
--- a/doc/delimitMate.txt
+++ b/doc/delimitMate.txt
@@ -335,8 +335,8 @@ e.g.: >
 ------------------------------------------------------------------------------
                                                   *'delimitMate_expand_space'*
                                                 *'b:delimitMate_expand_space'*
-Values: 1 or 0                                                       ~
-Default: 0                                                          ~
+Values: 1 or 0                                                               ~
+Default: 0                                                                   ~
 
 This option turns on/off the expansion of <Space>. Read |delimitMateExpansion|
 for details.
diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index e2b9ea1..238ad86 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -46,7 +46,7 @@ function! s:TestMappingsDo() "{{{
 				call delimitMate#UnMap()
 				call delimitMate#Map()
 				call delimitMate#TestMappings()
-				exec "normal i\<CR>"
+				normal o
 			endfor
 		endfor
 		let b:delimitMate_expand_space = temp_varsDM[0]
@@ -122,11 +122,17 @@ augroup delimitMate
 	autocmd FileType * call <SID>DelimitMateDo()
 
 	" Run on new buffers.
-	autocmd BufNewFile,BufRead,BufEnter * if !exists("b:loaded_delimitMate") | call <SID>DelimitMateDo() | endif
+	autocmd BufNewFile,BufRead,BufEnter *
+				\ if !exists("b:loaded_delimitMate") |
+				\ call <SID>DelimitMateDo() |
+				\ endif
 
 	" Flush the char buffer:
 	autocmd InsertEnter * call delimitMate#FlushBuffer()
-	autocmd BufEnter * if mode() == 'i' | call delimitMate#FlushBuffer() | endif
+	autocmd BufEnter *
+				\ if mode() == 'i' |
+				\ call delimitMate#FlushBuffer() |
+				\ endif
 
 augroup END