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

merge

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

2
.vim/syntax/nvpscript.vim
View file

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