Do not use <C-R>= for matchpairs. Close #150, close #143.

This commit is contained in:
Israel Chauca Fuentes
2013-12-18 23:05:30 -05:00
parent 5787ec4f59
commit 3dde5cc8cb

View File

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