From ece6c39a651cf6b4de931dadf7445cafee04f287 Mon Sep 17 00:00:00 2001
From: Israel Chauca Fuentes <israel@chauca.net>
Date: Sun, 15 Apr 2012 01:02:28 -0400
Subject: [PATCH] Add eol marker only if inserted on the same 'insert session'.

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

diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index c0400f7..59b5f31 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -439,6 +439,7 @@ function! delimitMate#ExpandSpace() "{{{
 endfunction "}}}
 
 function! delimitMate#BS() " {{{
+	let buffer_tail = get(b:_l_delimitMate_buffer, '-1', '')
 	if delimitMate#IsForbidden("")
 		let extra = ''
 	elseif &backspace !~ 'start\|2' && empty(b:_l_delimitMate_buffer)
@@ -452,12 +453,12 @@ function! delimitMate#BS() " {{{
 	else
 		let extra = ''
 	endif
-	if  search('\m\C\%#\%('
+	let tail_re = '\m\C\%('
 				\ . join(b:_l_delimitMate_right_delims, '\|')
 				\ . '\)'
-				\ . escape(b:_l_delimitMate_eol_marker, '\*.')
-				\ . '$',
-				\ 'cWn')
+				\ . escape(b:_l_delimitMate_eol_marker, '\*.^$')
+				\ . '$'
+	if buffer_tail =~ tail_re && search('\%#'.tail_re, 'cWn')
 		for c in range(len(split(b:_l_delimitMate_eol_marker, '\zs')))
 			let extra .= delimitMate#Del()
 		endfor