Skip to content

Commit

Permalink
tweaking the indentation level for JS and HTML
Browse files Browse the repository at this point in the history
  • Loading branch information
yml committed Oct 29, 2016
1 parent 1cc1183 commit 66d0e8e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions _gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@
excludesfile = "~/.gitignore"
[hub]
autoUpdate = never
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
9 changes: 8 additions & 1 deletion _vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ colorscheme inkpot
" ==========================================================
" Python
" ==========================================================
autocmd FileType javascript setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4
" Add the virtualenv's site-packages to vim path
if has('python')
py << EOF
Expand Down Expand Up @@ -194,8 +195,8 @@ let g:go_highlight_structs = 0

let g:go_fmt_command = "goimports"

au FileType go nmap <Leader>d <Plug>(go-def)
au FileType go nmap <Leader>gs <Plug>(go-implements)
au FileType go nmap <Leader>gd <Plug>(go-def)
au FileType go nmap <Leader>gi <Plug>(go-info)
au FileType go nmap <Leader>gh <Plug>(go-doc)
au FileType go nmap <leader>gr <Plug>(go-run)
Expand All @@ -208,8 +209,14 @@ let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
" ==========================================================
" Javascript
" ==========================================================
autocmd FileType javascript setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2
au BufRead *.js set makeprg=jslint\ %

" ==========================================================
" HTML
" ==========================================================
autocmd FileType xml,html,htmljinja,htmldjango setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2

" ==========================================================
" Trailing Space Helpers
" ==========================================================
Expand Down

0 comments on commit 66d0e8e

Please sign in to comment.