From bff9d7c3dce65f9918a8795d509a884c456c0141 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Tue, 22 Mar 2016 11:23:16 -0400 Subject: [PATCH] Update submodules and don't specify language for emmet (this is producing errors for whatever reason) --- vim/bundle/incsearch.vim | 2 +- vim/bundle/lightline.vim | 2 +- vim/bundle/tlib_vim | 2 +- vim/config/plugins.vim | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/vim/bundle/incsearch.vim b/vim/bundle/incsearch.vim index 2750442..fad9512 160000 --- a/vim/bundle/incsearch.vim +++ b/vim/bundle/incsearch.vim @@ -1 +1 @@ -Subproject commit 275044261ff1865f3c05ecaf0f5dcc3efd81975d +Subproject commit fad95120e73ce25205ce6de10c608b6ae700c897 diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim index 5f50a0d..997c4ba 160000 --- a/vim/bundle/lightline.vim +++ b/vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 5f50a0d0fac1bcfa3cfd082d93e5cbceee3ac752 +Subproject commit 997c4ba572d401fd2de865eab3be25a4ead31f78 diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim index 2bb17b7..bd4da0e 160000 --- a/vim/bundle/tlib_vim +++ b/vim/bundle/tlib_vim @@ -1 +1 @@ -Subproject commit 2bb17b766321270d45a9bbe5b57f90aaf45011c2 +Subproject commit bd4da0e28b345c2d373f846a7a6fbc0785b5ca06 diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index 9ea9bfc..0363fd9 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -64,12 +64,9 @@ scriptencoding utf-8 "}}} "EMMET: {{{ - let g:user_emmet_install_global=0 let g:use_emmet_complete_tag=1 let g:user_emmet_mode='a' - autocmd FileType aspnet,blade,html,xhtml,php,css,javascript,json EmmetInstall - if filereadable("~/.vim/snippets.json") let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n")) endif