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

2014-07-10 01:03:12 -05:00
parent 64bfc57529 ecc3f9ed11
commit d5cd4e6013
4 changed files with 6 additions and 3 deletions
--- a/.vim/vimrc
+++ b/.vim/vimrc
@ -70,6 +70,7 @@ au FileType yaml set tabstop=2 shiftwidth=2 softtabstop=2
 au FileType php set tabstop=4 shiftwidth=4 softtabstop=4
 au FileType make set noexpandtab
 au FileType ruby,eruby setlocal ts=2 sw=2 tw=79 et sts=2 autoindent colorcolumn=80
+au FileType puppet setlocal ts=2 sw=2 tw=80 et sts=2 autoindent colorcolumn=80

 " keyboard shortcuts
 nmap <silent> <leader>l :set list!<CR>