Merged detached head into master
This commit is contained in:
parent
0f8622cb97
commit
0104508044
1 changed files with 3 additions and 2 deletions
5
vimrc
5
vimrc
|
@ -330,8 +330,8 @@ au BufNewFile,BufRead *.js,*.java
|
||||||
\ set tabstop=2 |
|
\ set tabstop=2 |
|
||||||
\ set softtabstop=2 |
|
\ set softtabstop=2 |
|
||||||
\ set shiftwidth=2 |
|
\ set shiftwidth=2 |
|
||||||
|
\ set noexpandtab |
|
||||||
\ set textwidth=79 |
|
\ set textwidth=79 |
|
||||||
\ set expandtab |
|
|
||||||
\ set autoindent |
|
\ set autoindent |
|
||||||
\ set fileformat=unix
|
\ set fileformat=unix
|
||||||
|
|
||||||
|
@ -359,8 +359,9 @@ highlight BadWhitespace ctermbg=red guibg=red
|
||||||
|
|
||||||
" Display tabs at the beginning of a line in Python mode as bad.
|
" Display tabs at the beginning of a line in Python mode as bad.
|
||||||
au BufRead,BufNewFile *.py,*.pyw match BadWhitespace /^\t\+/
|
au BufRead,BufNewFile *.py,*.pyw match BadWhitespace /^\t\+/
|
||||||
|
au BufRead,BufNewFile *.js match BadWhitespace /^\s\+/
|
||||||
" Make trailing whitespaces be flagged as bad.
|
" Make trailing whitespaces be flagged as bad.
|
||||||
au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/
|
au BufRead,BufNewFile *.js,*.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/
|
||||||
|
|
||||||
" yaml syntax
|
" yaml syntax
|
||||||
" https://www.vim.org/scripts/script.php?script_id=739
|
" https://www.vim.org/scripts/script.php?script_id=739
|
||||||
|
|
Loading…
Reference in a new issue