Merge branch 'master' into jenipapo

This commit is contained in:
Thomas Ruoff
2017-06-25 23:15:24 +02:00

5
vimrc
View File

@@ -132,6 +132,7 @@ set nojoinspaces
" Folding {{{ " Folding {{{
set foldmethod=indent set foldmethod=indent
set foldlevelstart=5
" }}} " }}}
" Diff settings {{{ " Diff settings {{{
@@ -330,6 +331,10 @@ let g:markdown_fenced_languages = [
\ 'html', \ 'html',
\ 'javascript', 'js=javascript', 'json=javascript' \ 'javascript', 'js=javascript', 'json=javascript'
\ ] \ ]
" vim-jsx
let g:jsx_ext_required = 0
" }}} " }}}
" Autocmd Rules {{{ " Autocmd Rules {{{