Merge branch 'master' of github.com:joshtronic/dotfiles

This commit is contained in:
Josh Sherman 2016-09-18 21:04:27 -05:00
commit ffb15f7b2f
2 changed files with 9 additions and 4 deletions

View file

@ -52,9 +52,8 @@ autocmd BufNewFile,BufRead nginx.conf set filetype=nginx
autocmd BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache
autocmd BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=mustache
autocmd FileType css setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType javascript setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType go setlocal noexpandtab
autocmd FileType javascript,dustjs,handlebars,css setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType go setlocal noexpandtab
" Automatically wraps markdown and text to 80 columns
if &filetype == 'markdown' || &filetype == 'text'