diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2019-09-02 15:30:02 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@gcc.gnu.org> | 2019-09-02 15:30:02 +0300 |
| commit | 2b196fb76e1ff1ea15c3772ad59ee59018682eff (patch) | |
| tree | 75cec150ada97cb8107e99d7a98bde43ebffede2 /contrib | |
| parent | d2faf10f9578b16d8c262d5d8d307f5bfe3ee2bf (diff) | |
contrib/vimrc: override formatting options for more files
* vim-gcc-dev/syntax/gcc-match.vim: Do not override 'tabstop' here.
* vimrc: Set preferred values for 'tabstop', 'softtabstop',
'shiftwidth', 'noexpandtab', 'textwidth', 'formatoptions' for all
files, not just C-like files.
From-SVN: r275316
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/vim-gcc-dev/syntax/gcc-match.vim | 2 | ||||
| -rw-r--r-- | contrib/vimrc | 12 |
3 files changed, 13 insertions, 8 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e5429d79a3d..af7b08b327e 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,10 @@ +2019-09-02 Alexander Monakov <amonakov@ispras.ru> + + * vim-gcc-dev/syntax/gcc-match.vim: Do not override 'tabstop' here. + * vimrc: Set preferred values for 'tabstop', 'softtabstop', + 'shiftwidth', 'noexpandtab', 'textwidth', 'formatoptions' for all + files, not just C-like files. + 2019-09-02 Martin Liska <mliska@suse.cz> * vim-gcc-dev/syntax/gcc-match.vim: Set tabstop=8. diff --git a/contrib/vim-gcc-dev/syntax/gcc-match.vim b/contrib/vim-gcc-dev/syntax/gcc-match.vim index e46140da044..356b07a15b2 100644 --- a/contrib/vim-gcc-dev/syntax/gcc-match.vim +++ b/contrib/vim-gcc-dev/syntax/gcc-match.vim @@ -68,6 +68,4 @@ hi def link pdComment Comment hi def link pdTodo Todo hi def link pdPreProc PreProc -setlocal tabstop=8 - let b:current_syntax = "gcc-match" diff --git a/contrib/vimrc b/contrib/vimrc index 7c0c5878c63..bbbe1dd449b 100644 --- a/contrib/vimrc +++ b/contrib/vimrc @@ -31,17 +31,17 @@ function! SetStyle() if stridx(l:fname, 'libsanitizer') != -1 return endif + setlocal tabstop=8 + setlocal softtabstop=2 + setlocal shiftwidth=2 + setlocal noexpandtab + setlocal textwidth=80 + setlocal formatoptions-=ro formatoptions+=cqlt let l:ext = fnamemodify(l:fname, ":e") let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java'] if index(l:c_exts, l:ext) != -1 setlocal cindent - setlocal tabstop=8 - setlocal softtabstop=2 - setlocal shiftwidth=2 - setlocal noexpandtab setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,f0,h2,p4,t0,+2,(0,u0,w1,m0 - setlocal textwidth=80 - setlocal formatoptions-=ro formatoptions+=cqlt endif endfunction |