From e5ce5b0967b9a3316b1880fe2d690ee2def3d8d3 Mon Sep 17 00:00:00 2001
From: Israel Chauca Fuentes <israel@chauca.net>
Date: Sun, 23 May 2010 14:29:50 -0500
Subject: [PATCH] Fix: automatic indent was broken when expanding <CR>.

---
 autoload/delimitMate.vim | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index fb6156b..e8cb9b3 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -442,19 +442,18 @@ function! delimitMate#MapMsg(msg) "{{{
 endfunction "}}}
 
 function! delimitMate#ExpandReturn() "{{{
-	if delimitMate#WithinEmptyPair() &&
-				\ b:delimitMate_expand_cr
+	if delimitMate#WithinEmptyPair()
 		" Expand:
 		call delimitMate#FlushBuffer()
-		return "\<Esc>a\<CR>x\<CR>\<Esc>k$\"_xa"
+		"return "\<Esc>a\<CR>x\<CR>\<Esc>k$\"_xa"
+		return "\<CR>\<UP>\<Esc>o"
 	else
 		return "\<CR>"
 	endif
 endfunction "}}}
 
 function! delimitMate#ExpandSpace() "{{{
-	if delimitMate#WithinEmptyPair() &&
-				\ b:delimitMate_expand_space
+	if delimitMate#WithinEmptyPair()
 		" Expand:
 		call insert(b:delimitMate_buffer, 's')
 		return delimitMate#WriteAfter(' ') . "\<Space>"