VimPlug/delimitMate
1
0
Fork 0
mirror of https://github.com/Raimondi/delimitMate.git synced 2025-12-16 01:17:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use #Finish() until completion has been used.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2010-08-14 20:34:25 -05:00
parent 90cb449ada
commit 0441a03bb9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/delimitMate.vim
View File

@@ -268,10 +268,18 @@ function! s:DelimitMateSwitch() "{{{
endif endif
endfunction "}}} endfunction "}}}
function! s:Finish()
if exists('g:delimitMate_loaded')
return delimitMate#Finish()
endif
return ''
endfunction
function! s:FlushBuffer() function! s:FlushBuffer()
if exists('g:delimitMate_loaded') if exists('g:delimitMate_loaded')
call delimitMate#FlushBuffer() return delimitMate#FlushBuffer()
endif endif
return ''
endfunction endfunction
"}}} "}}}
@@ -337,14 +345,14 @@ function! s:ExtraMappings() "{{{
inoremap <silent> <Plug>delimitMateDel <C-R>=delimitMate#Del()<CR> inoremap <silent> <Plug>delimitMateDel <C-R>=delimitMate#Del()<CR>
" Flush the char buffer on movement keystrokes or when leaving insert mode: " Flush the char buffer on movement keystrokes or when leaving insert mode:
for map in ['Esc', 'Left', 'Right', 'Home', 'End'] for map in ['Esc', 'Left', 'Right', 'Home', 'End']
exec 'inoremap <silent> <Plug>delimitMate'.map.' <C-R>=delimitMate#Finish()<CR><'.map.'>' exec 'inoremap <silent> <Plug>delimitMate'.map.' <C-R>=<SID>Finish()<CR><'.map.'>'
if !hasmapto('<Plug>delimitMate'.map, 'i') if !hasmapto('<Plug>delimitMate'.map, 'i')
exec 'silent! imap <unique> <buffer> <'.map.'> <Plug>delimitMate'.map exec 'silent! imap <unique> <buffer> <'.map.'> <Plug>delimitMate'.map
endif endif
endfor endfor
" Except when pop-up menu is active: " Except when pop-up menu is active:
for map in ['Up', 'Down', 'PageUp', 'PageDown', 'S-Down', 'S-Up'] for map in ['Up', 'Down', 'PageUp', 'PageDown', 'S-Down', 'S-Up']
exec 'inoremap <silent> <expr> <Plug>delimitMate'.map.' pumvisible() ? "\<'.map.'>" : "<C-R>=delimitMate#Finish()<CR><'.map.'>"' exec 'inoremap <silent> <expr> <Plug>delimitMate'.map.' pumvisible() ? "\<'.map.'>" : "<C-R>=<SID>Finish()<CR><'.map.'>"'
if !hasmapto('<Plug>delimitMate'.map, 'i') if !hasmapto('<Plug>delimitMate'.map, 'i')
exec 'silent! imap <unique> <buffer> <'.map.'> <Plug>delimitMate'.map exec 'silent! imap <unique> <buffer> <'.map.'> <Plug>delimitMate'.map
endif endif