diff options
| -rw-r--r-- | .gitmodules | 17 | ||||
| -rwxr-xr-x | bundle-update.sh | 8 | ||||
| m--------- | bundle/unbundle | 0 | ||||
| -rw-r--r-- | config/ycm.vim | 2 | ||||
| m--------- | pack/bundle/start/YouCompleteMe (renamed from bundle/YouCompleteMe) | 0 | ||||
| m--------- | pack/bundle/start/airline (renamed from bundle/airline) | 0 | ||||
| m--------- | pack/bundle/start/clang-format (renamed from bundle/clang-format) | 0 | ||||
| m--------- | pack/bundle/start/grammarous (renamed from bundle/grammarous) | 0 | ||||
| m--------- | pack/bundle/start/markdown (renamed from bundle/markdown) | 0 | ||||
| m--------- | pack/bundle/start/scratch (renamed from bundle/scratch) | 0 | ||||
| m--------- | pack/bundle/start/tabular (renamed from bundle/tabular) | 0 | ||||
| -rw-r--r-- | vimrc | 2 |
12 files changed, 14 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules index e961246..60039ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,21 @@ -[submodule "bundle/unbundle"] - path = bundle/unbundle - url = https://github.com/sunaku/vim-unbundle.git [submodule "bundle/markdown"] - path = bundle/markdown + path = pack/bundle/start/markdown url = https://github.com/plasticboy/vim-markdown.git [submodule "bundle/tabular"] - path = bundle/tabular + path = pack/bundle/start/tabular url = https://github.com/godlygeek/tabular.git [submodule "bundle/scratch"] - path = bundle/scratch + path = pack/bundle/start/scratch url = https://github.com/mtth/scratch.vim.git [submodule "bundle/airline"] - path = bundle/airline + path = pack/bundle/start/airline url = https://github.com/bling/vim-airline.git [submodule "bundle/grammarous"] - path = bundle/grammarous + path = pack/bundle/start/grammarous url = https://github.com/rhysd/vim-grammarous.git [submodule "bundle/clang-format"] - path = bundle/clang-format + path = pack/bundle/start/clang-format url = https://github.com/rhysd/vim-clang-format.git [submodule "bundle/YouCompleteMe"] - path = bundle/YouCompleteMe + path = pack/bundle/start/YouCompleteMe url = https://github.com/ycm-core/YouCompleteMe.git diff --git a/bundle-update.sh b/bundle-update.sh index 5f50a0a..578d1e8 100755 --- a/bundle-update.sh +++ b/bundle-update.sh @@ -1,10 +1,12 @@ #!/bin/sh wd=$(dirname $0) +path="pack/bundle/start" +branch=$(git branch --show-current) -for i in $(ls $wd/bundle); do - pushd $wd/bundle/$i - git pull origin master +for i in $(ls $wd/$path); do + pushd $wd/$path/$i + git pull origin $branch popd > /dev/null done diff --git a/bundle/unbundle b/bundle/unbundle deleted file mode 160000 -Subproject 11ed288e0db02e3caa6037c8d463379b80a4e8a diff --git a/config/ycm.vim b/config/ycm.vim index ca476c6..a9b3c20 100644 --- a/config/ycm.vim +++ b/config/ycm.vim @@ -1,4 +1,4 @@ -let g:ycm_use_clangd = 0 +let g:ycm_use_clangd = 1 let $VIMHOME=expand('<sfile>:p:h:h') let g:ycm_global_ycm_extra_conf = expand('<sfile>:p:h:h').'/misc/ycm_conf.py' let g:ycm_confirm_extra_conf = 1 diff --git a/bundle/YouCompleteMe b/pack/bundle/start/YouCompleteMe -Subproject 0dc8989e394ce02adb1c4a0d4a7981017e21299 +Subproject 0dc8989e394ce02adb1c4a0d4a7981017e21299 diff --git a/bundle/airline b/pack/bundle/start/airline -Subproject 9d20473e912ab39008a25b1902e5f35189e67aa +Subproject 9d20473e912ab39008a25b1902e5f35189e67aa diff --git a/bundle/clang-format b/pack/bundle/start/clang-format -Subproject 6b791825ff478061ad1c57b21bb1ed5a5fd0eb2 +Subproject 6b791825ff478061ad1c57b21bb1ed5a5fd0eb2 diff --git a/bundle/grammarous b/pack/bundle/start/grammarous -Subproject db46357465ce587d5325e816235b5e92415f8c0 +Subproject db46357465ce587d5325e816235b5e92415f8c0 diff --git a/bundle/markdown b/pack/bundle/start/markdown -Subproject 3a9643961233c2812816078af8bd1eaabc530dc +Subproject 3a9643961233c2812816078af8bd1eaabc530dc diff --git a/bundle/scratch b/pack/bundle/start/scratch -Subproject adf826b1ac067cdb4168cb6066431cff3a2d37a +Subproject adf826b1ac067cdb4168cb6066431cff3a2d37a diff --git a/bundle/tabular b/pack/bundle/start/tabular -Subproject 339091ac4dd1f17e225fe7d57b48aff55f99b23 +Subproject 339091ac4dd1f17e225fe7d57b48aff55f99b23 @@ -69,6 +69,6 @@ else map <M-Up> [s endif -runtime bundle/unbundle/plugin/unbundle.vim runtime! config/*.vim +autocmd BufNewFile,BufRead Makefile set noexpandtab |