From 5ceafd17a2f56d645a478a4740b7eb21c70e6dcd Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Tue, 30 Jul 2013 13:28:16 -0400 Subject: [PATCH 1/2] updates --- .vim/bundle/NrrwRgn | 2 +- .vim/bundle/YouCompleteMe | 2 +- .vim/bundle/calendar-vim | 2 +- .vim/bundle/fish-syntax | 2 +- .vim/bundle/nerdtree | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/vim-fugitive | 2 +- .vim/bundle/vim-multiple-cursors | 2 +- .vim/bundle/vim-puppet | 2 +- .vim/bundle/vim-sparkup | 2 +- .vim/bundle/vim-unimpaired | 2 +- .vim/syntax/nvpscript.vim | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.vim/bundle/NrrwRgn b/.vim/bundle/NrrwRgn index b73f97b..680f60f 160000 --- a/.vim/bundle/NrrwRgn +++ b/.vim/bundle/NrrwRgn @@ -1 +1 @@ -Subproject commit b73f97b7653818ed9a010dffb8fea98181b8bab9 +Subproject commit 680f60fb237370d6eda2bfb28cd660916991733e diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index 0c19ee4..f347885 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit 0c19ee4fa78f69b4591fe107c104b07174cd661c +Subproject commit f347885555b8446953c1c936830e85275b99ddfd diff --git a/.vim/bundle/calendar-vim b/.vim/bundle/calendar-vim index 7b0a2c7..0284450 160000 --- a/.vim/bundle/calendar-vim +++ b/.vim/bundle/calendar-vim @@ -1 +1 @@ -Subproject commit 7b0a2c727086d39f658225bb00cd117770bf9245 +Subproject commit 0284450ee16dfab2300f6b68c68b9e718f4f98bd diff --git a/.vim/bundle/fish-syntax b/.vim/bundle/fish-syntax index 195fbd1..4f21d02 160000 --- a/.vim/bundle/fish-syntax +++ b/.vim/bundle/fish-syntax @@ -1 +1 @@ -Subproject commit 195fbd1d31d0bab944b0b92fb7ffa83fb50c4524 +Subproject commit 4f21d024f91016aae2014cc99e6279e39b2fbbcc diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree index 448ad6f..b0bb781 160000 --- a/.vim/bundle/nerdtree +++ b/.vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 448ad6f1bce0308329ccb020b51710227108b578 +Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index 7f0412e..f165e8b 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 7f0412e91dd6e2b48cbe8ae54bddcfeca0c127c1 +Subproject commit f165e8b4a2cf002e8d425808dab1568e57b66ec1 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive index 54ead5a..124550c 160000 --- a/.vim/bundle/vim-fugitive +++ b/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 54ead5abcbfdd776e1160b5510a129884c39f29c +Subproject commit 124550cfee33a1bb9a227e78ccc709317a89dae9 diff --git a/.vim/bundle/vim-multiple-cursors b/.vim/bundle/vim-multiple-cursors index 679469e..8c9bced 160000 --- a/.vim/bundle/vim-multiple-cursors +++ b/.vim/bundle/vim-multiple-cursors @@ -1 +1 @@ -Subproject commit 679469ed357e141b8b028e1a0c0a12752704fd7a +Subproject commit 8c9bcedc6c534d3f308fa3ade6a459977ee4a58a diff --git a/.vim/bundle/vim-puppet b/.vim/bundle/vim-puppet index 82a88e7..4e78429 160000 --- a/.vim/bundle/vim-puppet +++ b/.vim/bundle/vim-puppet @@ -1 +1 @@ -Subproject commit 82a88e75e1d2ea392176debb5e3b63dadc6a8339 +Subproject commit 4e784293f6e36494d6c4578634abc6aca3d2028d diff --git a/.vim/bundle/vim-sparkup b/.vim/bundle/vim-sparkup index b5e9269..71cdd2d 160000 --- a/.vim/bundle/vim-sparkup +++ b/.vim/bundle/vim-sparkup @@ -1 +1 @@ -Subproject commit b5e9269136ae8dc7d6fbd5ed8777cbcd8cc22fbf +Subproject commit 71cdd2d9a212be6367d8f716a19bf5caf11bd0ec diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired index cabf4b7..48d1cb6 160000 --- a/.vim/bundle/vim-unimpaired +++ b/.vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit cabf4b79b1c0cd9c9a8beec303c2e6172c82d19f +Subproject commit 48d1cb6bf0000159291014226d8d8d3330ad875e diff --git a/.vim/syntax/nvpscript.vim b/.vim/syntax/nvpscript.vim index 990886d..a19e65d 100644 --- a/.vim/syntax/nvpscript.vim +++ b/.vim/syntax/nvpscript.vim @@ -1,6 +1,6 @@ " Vim syn file " Language: NVISION Script -" Maintainer: John Cook +" Maintainer: Barak Michener " Last Change: 2006 Jun 29 " For version 5.x: Clear all syntax items From d0f9a2e73312c19f2a3db6045aa8e86a6a8e3c40 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sat, 10 Aug 2013 16:43:07 -0400 Subject: [PATCH 2/2] protect python settings --- .vim/bundle/YouCompleteMe | 2 +- .vim/bundle/syntastic | 2 +- .vim/bundle/vim-gitgutter | 2 +- .vim/bundle/vim-unimpaired | 2 +- .vim/filetype.vim | 24 +++++++++++++----------- .vimrc | 1 + 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index f347885..b46aa00 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit f347885555b8446953c1c936830e85275b99ddfd +Subproject commit b46aa009fd2660178d7d4bd49d2ea47a7ff530b9 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic index f165e8b..48208d4 160000 --- a/.vim/bundle/syntastic +++ b/.vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit f165e8b4a2cf002e8d425808dab1568e57b66ec1 +Subproject commit 48208d46f84eae9e08b41bb9b41b15bc60aac6ef diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter index ff031d0..1511325 160000 --- a/.vim/bundle/vim-gitgutter +++ b/.vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit ff031d022f2123353bc93a3aa97290287c10a287 +Subproject commit 15113259bbd85174ce865187cf872afc7c9c22d1 diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired index 48d1cb6..0b4d112 160000 --- a/.vim/bundle/vim-unimpaired +++ b/.vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit 48d1cb6bf0000159291014226d8d8d3330ad875e +Subproject commit 0b4d1123e727bc4b1a416d835c6995591f0f33b1 diff --git a/.vim/filetype.vim b/.vim/filetype.vim index c50ce9b..c0962c5 100644 --- a/.vim/filetype.vim +++ b/.vim/filetype.vim @@ -45,17 +45,19 @@ au BufRead,BufNewFile *.go set filetype=go "Settings per filetype -"augroup python - ""autocmd FileType python set omnifunc=pythoncomplete#Complete - ""autocmd FileType python call SuperTabSetCompletionType("") - ""autocmd FileType python set completeopt-=preview - "autocmd FileType python set ts=4 - "autocmd FileType python set softtabstop=4 - "autocmd FileType python set shiftwidth=4 - "autocmd FileType python set expandtab - "autocmd FileType python set nosmartindent - "autocmd FileType python let b:auto_trim_whitespace=1 -"augroup END +if g:UseGooglePythonSettings == 0 + augroup python + ""autocmd FileType python set omnifunc=pythoncomplete#Complete + ""autocmd FileType python call SuperTabSetCompletionType("") + ""autocmd FileType python set completeopt-=preview + autocmd FileType python set ts=4 + autocmd FileType python set softtabstop=4 + autocmd FileType python set shiftwidth=4 + autocmd FileType python set expandtab + autocmd FileType python set nosmartindent + "autocmd FileType python let b:auto_trim_whitespace=1 + augroup END +endif "augroup javascript "autocmd FileType javascript set ts=4 "autocmd FileType javascript set softtabstop=4 diff --git a/.vimrc b/.vimrc index 8cb0509..8f9753d 100644 --- a/.vimrc +++ b/.vimrc @@ -123,6 +123,7 @@ setlocal cursorline let python_highlight_all = 1 let g:Tb_MaxSize=0 let g:Tb_MapCTabSwitchBufs = 1 +let g:UseGooglePythonSettings = 0 " * Configure browser for haskell_doc.vim let g:haddock_browser = "open"