Merge branch 'master' into jump_over

This commit is contained in:
Israel Chauca Fuentes
2010-12-07 17:05:00 -06:00

View File

@@ -217,25 +217,23 @@ function! s:TestMappingsDo() "{{{
endfunction "}}} endfunction "}}}
function! s:DelimitMateDo(...) "{{{ function! s:DelimitMateDo(...) "{{{
" Initialize settings:
call s:init()
" Check if this file type is excluded:
if exists("g:delimitMate_excluded_ft") &&
\ index(split(g:delimitMate_excluded_ft, ','), &filetype, 0, 1) >= 0
" Remove any magic:
call s:Unmap()
" Finish here:
return 1
endif
" First, remove all magic, if needed: " First, remove all magic, if needed:
if exists("b:delimitMate_enabled") && b:delimitMate_enabled == 1 if exists("b:delimitMate_enabled") && b:delimitMate_enabled == 1
call s:Unmap() call s:Unmap()
endif endif
" Check if this file type is excluded:
if exists("g:delimitMate_excluded_ft") &&
\ index(split(g:delimitMate_excluded_ft, ','), &filetype, 0, 1) >= 0
" Finish here:
return 1
endif
" Initialize settings:
call s:init()
" Now, add magic: " Now, add magic:
call s:Map() call s:Map()
@@ -245,12 +243,12 @@ function! s:DelimitMateDo(...) "{{{
endfunction "}}} endfunction "}}}
function! s:DelimitMateSwitch() "{{{ function! s:DelimitMateSwitch() "{{{
call s:init()
if exists("b:delimitMate_enabled") && b:delimitMate_enabled if exists("b:delimitMate_enabled") && b:delimitMate_enabled
call s:Unmap() call s:Unmap()
echo "delimitMate has been disabled." echo "delimitMate has been disabled."
else else
call s:Unmap() call s:Unmap()
call s:init()
call s:Map() call s:Map()
echo "delimitMate has been enabled." echo "delimitMate has been enabled."
endif endif