Merge pull request #258 from Cade-Forester/patch-1

Fix: don't ignore g:user_emmet_complete_tag
This commit is contained in:
mattn
2015-02-27 00:53:58 +09:00

View File

@@ -90,10 +90,6 @@ if !exists('g:emmet_curl_command')
let g:emmet_curl_command = 'curl -s -L -A Mozilla/5.0' let g:emmet_curl_command = 'curl -s -L -A Mozilla/5.0'
endif endif
if exists('g:user_emmet_complete_tag') && g:user_emmet_complete_tag
setlocal omnifunc=emmet#completeTag
endif
if !exists('g:user_emmet_leader_key') if !exists('g:user_emmet_leader_key')
let g:user_emmet_leader_key = '<c-y>' let g:user_emmet_leader_key = '<c-y>'
endif endif
@@ -148,6 +144,14 @@ function! s:install_plugin(mode, buffer)
exe item.mode . 'map ' . buffer . ' <unique> ' . key . ' <plug>(' . item.plug . ')' exe item.mode . 'map ' . buffer . ' <unique> ' . key . ' <plug>(' . item.plug . ')'
endif endif
endfor endfor
if exists('g:user_emmet_complete_tag') && g:user_emmet_complete_tag
if get(g:, 'user_emmet_install_global', 1)
set omnifunc=emmet#completeTag
else
setlocal omnifunc=emmet#completeTag
endif
endif
endfunction endfunction
command! -nargs=0 -bar EmmetInstall call <SID>install_plugin(get(g:, 'user_emmet_mode', 'a'), 1) command! -nargs=0 -bar EmmetInstall call <SID>install_plugin(get(g:, 'user_emmet_mode', 'a'), 1)