From 3dde5cc8cb78c7845ecbba2eefd9cf3736e82b47 Mon Sep 17 00:00:00 2001
From: Israel Chauca Fuentes <israel@chauca.net>
Date: Wed, 18 Dec 2013 23:05:30 -0500
Subject: [PATCH] Do not use <C-R>= for matchpairs. Close #150, close #143.

---
 plugin/delimitMate.vim | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index e212730..d6296ad 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -273,15 +273,19 @@ function! s:AutoClose() "{{{
 	while i < len(s:g('matchpairs_list'))
 		let ld = s:g('left_delims')[i] == '|' ? '<bar>' : s:g('left_delims')[i]
 		let rd = s:g('right_delims')[i] == '|' ? '<bar>' : s:g('right_delims')[i]
-		exec 'inoremap <silent> <Plug>delimitMate' . ld . ' <C-R>=delimitMate#ParenDelim("' . escape(rd, '|') . '")<CR>'
-		exec 'silent! imap <unique> <buffer> '.ld.' <Plug>delimitMate'.ld
+		exec 'inoremap <expr><silent> <Plug>delimitMate' . ld
+								\. ' delimitMate#ParenDelim("' . escape(rd, '|') . '")'
+		exec 'silent! imap <unique> <buffer> '.ld
+								\.' <Plug>delimitMate'.ld
 		let i += 1
 	endwhile
 
 	" Exit from inside the matching pair:
 	for delim in s:g('right_delims')
-		exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-R>=delimitMate#JumpOut("\' . delim . '")<CR>'
-		exec 'silent! imap <unique> <buffer> ' . delim . ' <Plug>delimitMate'. delim
+		exec 'inoremap <expr><silent> <Plug>delimitMate' . delim
+								\. ' delimitMate#JumpOut("\' . delim . '")'
+		exec 'silent! imap <unique> <buffer> ' . delim
+								\. ' <Plug>delimitMate'. delim
 	endfor
 
 	" Add matching quote and jump to the midle, or exit if inside a pair of matching quotes: