revert filetype

This commit is contained in:
Barak Michener 2013-08-24 15:13:54 -04:00
parent bdd00969c5
commit f533ed97ce
3 changed files with 15 additions and 13 deletions

3
.gitmodules vendored
View file

@ -70,3 +70,6 @@
[submodule ".vim/bundle/vim-gocode"]
path = .vim/bundle/vim-gocode
url = https://github.com/Blackrush/vim-gocode.git
[submodule ".vim/bundle/vim-airline"]
path = .vim/bundle/vim-airline
url = https://github.com/bling/vim-airline

@ -0,0 +1 @@
Subproject commit 8f0401580bae2ccf00d23d2f89c8db564e5260fe

View file

@ -45,19 +45,17 @@ au BufRead,BufNewFile *.go set filetype=go
"Settings per filetype
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 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
"augroup javascript
"autocmd FileType javascript set ts=4
"autocmd FileType javascript set softtabstop=4