Browse Source

Merge branch 'master' of https://bitbucket.org/juliobiason/vim-configs

Conflicts:
	configs/vimrc
master
julio.biason 9 years ago
parent
commit
fe90830f60
  1. 8
      configs/vimrc

8
configs/vimrc

@ -125,6 +125,8 @@ Plugin 'tomasr/molokai'
Plugin 'Glench/Vim-Jinja2-Syntax'
Plugin 'fmoralesc/vim-pinpoint'
Plugin 'gorodinskiy/vim-coloresque'
Plugin 'kchmck/vim-coffee-script'
Plugin 'mattn/emmet-vim'
" Project tree
Plugin 'scrooloose/nerdtree'
@ -148,6 +150,9 @@ Plugin 'ingo-library'
Plugin 'IndentTab'
let g:IndentTab_scopes = 'indent'
" Editor configuration
Plugin 'editorconfig/editorconfig-vim'
" Mega-autocomplete
" Plugin 'Valloric/YouCompleteMe'
@ -249,6 +254,9 @@ au FileType mail setlocal spell spelllang=en
" place than Python.
au FileType javascript setlocal expandtab tabstop=2 sw=2 sts=2 textwidth=0
" Default style for cofeescript files
au FileType coffee setlocal noet ts=2 sw=2 sts=2 list
" Default JSON styles
" Every file with the extesion "json" should have the filetype "json";
" Use spaces instead of tabs and use 4 spaces for it.

Loading…
Cancel
Save