barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

protect python settings

Browse source
This commit is contained in:
Barak Michener 2013-08-10 16:43:07 -04:00
parent 5ceafd17a2
commit d0f9a2e733
6 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vim/bundle/YouCompleteMe

@ -1 +1 @@
Subproject commit f347885555b8446953c1c936830e85275b99ddfd
Subproject commit b46aa009fd2660178d7d4bd49d2ea47a7ff530b9

2
.vim/bundle/syntastic

@ -1 +1 @@
Subproject commit f165e8b4a2cf002e8d425808dab1568e57b66ec1
Subproject commit 48208d46f84eae9e08b41bb9b41b15bc60aac6ef

2
.vim/bundle/vim-gitgutter

@ -1 +1 @@
Subproject commit ff031d022f2123353bc93a3aa97290287c10a287
Subproject commit 15113259bbd85174ce865187cf872afc7c9c22d1

2
.vim/bundle/vim-unimpaired

@ -1 +1 @@
Subproject commit 48d1cb6bf0000159291014226d8d8d3330ad875e
Subproject commit 0b4d1123e727bc4b1a416d835c6995591f0f33b1

24
.vim/filetype.vim
View file

@ -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("<C-X><C-O>")
""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("<C-X><C-O>")
""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

1
.vimrc
View file

@ -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"