This commit is contained in:
Barak Michener 2013-08-18 16:37:21 -04:00
commit bdd00969c5
3 changed files with 15 additions and 12 deletions

View file

@ -45,17 +45,19 @@ au BufRead,BufNewFile *.go set filetype=go
"Settings per filetype "Settings per filetype
augroup python if g:UseGooglePythonSettings == 0
"autocmd FileType python set omnifunc=pythoncomplete#Complete augroup python
"autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>") ""autocmd FileType python set omnifunc=pythoncomplete#Complete
"autocmd FileType python set completeopt-=preview ""autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
autocmd FileType python set ts=4 ""autocmd FileType python set completeopt-=preview
autocmd FileType python set softtabstop=4 autocmd FileType python set ts=4
autocmd FileType python set shiftwidth=4 autocmd FileType python set softtabstop=4
autocmd FileType python set expandtab autocmd FileType python set shiftwidth=4
autocmd FileType python set nosmartindent autocmd FileType python set expandtab
autocmd FileType python let b:auto_trim_whitespace=1 autocmd FileType python set nosmartindent
augroup END "autocmd FileType python let b:auto_trim_whitespace=1
augroup END
endif
"augroup javascript "augroup javascript
"autocmd FileType javascript set ts=4 "autocmd FileType javascript set ts=4
"autocmd FileType javascript set softtabstop=4 "autocmd FileType javascript set softtabstop=4

View file

@ -1,6 +1,6 @@
" Vim syn file " Vim syn file
" Language: NVISION Script " Language: NVISION Script
" Maintainer: John Cook <john.cook@kla-tencor.com> " Maintainer: Barak Michener
" Last Change: 2006 Jun 29 " Last Change: 2006 Jun 29
" For version 5.x: Clear all syntax items " For version 5.x: Clear all syntax items

1
.vimrc
View file

@ -123,6 +123,7 @@ setlocal cursorline
let python_highlight_all = 1 let python_highlight_all = 1
let g:Tb_MaxSize=0 let g:Tb_MaxSize=0
let g:Tb_MapCTabSwitchBufs = 1 let g:Tb_MapCTabSwitchBufs = 1
let g:UseGooglePythonSettings = 0
" * Configure browser for haskell_doc.vim " * Configure browser for haskell_doc.vim
let g:haddock_browser = "open" let g:haddock_browser = "open"