From 8f42e27a47ae979b3fb2d3a8e7114822e995b641 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Fri, 14 Nov 2014 15:46:07 -0500 Subject: [PATCH] Update submodules --- vim/bundle/incsearch.vim | 2 +- vim/bundle/lightline.vim | 2 +- vim/bundle/tlib_vim | 2 +- vim/bundle/unite.vim | 2 +- vim/bundle/vim-easytags | 2 +- vim/bundle/vim-misc | 2 +- vim/config/keyboard.vim | 5 ++++- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/vim/bundle/incsearch.vim b/vim/bundle/incsearch.vim index 09b39a4..293c810 160000 --- a/vim/bundle/incsearch.vim +++ b/vim/bundle/incsearch.vim @@ -1 +1 @@ -Subproject commit 09b39a418b6c96256e91ae53d96e721ca8708baa +Subproject commit 293c810976861a99eebb80e668f21ab9f127756a diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim index 72a413e..22b269a 160000 --- a/vim/bundle/lightline.vim +++ b/vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 72a413e60c101e71f26ef2e3cf42d662fe730aae +Subproject commit 22b269a50dcc591eee83bb6d6d0d6dce0641329c diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim index 88c5a24..344a6d3 160000 --- a/vim/bundle/tlib_vim +++ b/vim/bundle/tlib_vim @@ -1 +1 @@ -Subproject commit 88c5a2427e12397f9b5b1819e3d80c2eebe2c411 +Subproject commit 344a6d3d5cad0c2c6b922194b853ea28d1eef597 diff --git a/vim/bundle/unite.vim b/vim/bundle/unite.vim index bc48c2b..b508b62 160000 --- a/vim/bundle/unite.vim +++ b/vim/bundle/unite.vim @@ -1 +1 @@ -Subproject commit bc48c2b00d457437585bc1d12f006bdeef7f9a3d +Subproject commit b508b62d433bfaff063297cfdc3d8be701df713a diff --git a/vim/bundle/vim-easytags b/vim/bundle/vim-easytags index 706c665..075ffe9 160000 --- a/vim/bundle/vim-easytags +++ b/vim/bundle/vim-easytags @@ -1 +1 @@ -Subproject commit 706c6650f3af2f44352f2d0dfc64be5727e1c097 +Subproject commit 075ffe9054dd71f8c2f26fe9cfa4fd5200e6af96 diff --git a/vim/bundle/vim-misc b/vim/bundle/vim-misc index 15fd181..038faed 160000 --- a/vim/bundle/vim-misc +++ b/vim/bundle/vim-misc @@ -1 +1 @@ -Subproject commit 15fd181de7ce8a07aa779d1b329cbf4d6e36366c +Subproject commit 038faedc0767141dd4469978bc6575807fa3eb31 diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 9c1bb03..3112262 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -618,7 +618,7 @@ "} "AUTOCOMPLETION:{ - "emmet switch triggerkey from + "emmet switch triggerkey from ctrl-y let g:user_emmet_leader_key='' "neocomplcache close popup and save indent @@ -626,10 +626,13 @@ function! s:neocompl_cr() return pumvisible() ? neocomplcache#close_popup() : "\" endfunction + "neocomplcache tab completion inoremap pumvisible() ? "\" : "\" + "neocomplcache : undo completion inoremap neocomplcache#smart_close_popup()."\" + "neocomplcache undo completion inoremap neocomplcache#undo_completion() "}