diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-22 21:54:41 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-22 21:54:41 +1200 |
| commit | 9931b35cc197c76350b2e22e0a1fe6536888ac53 (patch) | |
| tree | 420c1bba0de3f0d781680c2ca3ed5345662144e0 /vim/indent | |
| parent | Don't squeeze blanks by default in mail filetype (diff) | |
| download | dotfiles-9931b35cc197c76350b2e22e0a1fe6536888ac53.tar.gz dotfiles-9931b35cc197c76350b2e22e0a1fe6536888ac53.zip | |
Correct indent settings
Diffstat (limited to 'vim/indent')
| -rw-r--r-- | vim/indent/csv.vim | 10 | ||||
| -rw-r--r-- | vim/indent/help.vim | 16 |
2 files changed, 19 insertions, 7 deletions
diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim index a9aba056..e97ab29e 100644 --- a/vim/indent/csv.vim +++ b/vim/indent/csv.vim @@ -10,8 +10,14 @@ let b:undo_indent = 'setlocal autoindent<' " Literal tabs setlocal noexpandtab -setlocal shiftwidth=0 -let b:undo_indent = 'setlocal expandtab< shiftwidth<' +let b:undo_indent .= '|setlocal expandtab<' +if v:version > 703 + \ || v:version == 703 && has('patch629') + setlocal shiftwidth=0 +else + let &l:shiftwidth = &l:tabstop +endif +let b:undo_indent .= '|setlocal shiftwidth<' if &softtabstop != -1 let &l:softtabstop = &l:shiftwidth let b:undo_indent .= '|setlocal softtabstop<' diff --git a/vim/indent/help.vim b/vim/indent/help.vim index c49e1ced..78de85d0 100644 --- a/vim/indent/help.vim +++ b/vim/indent/help.vim @@ -4,11 +4,17 @@ if exists('b:did_indent') endif let b:did_indent = 1 -" Use hard tabs for editing Vim help files +" Literal tabs setlocal noexpandtab -setlocal shiftwidth=0 -let b:undo_indent = 'setlocal expandtab< shiftwidth<' +let b:undo_indent = 'setlocal expandtab<' +if v:version > 703 + \ || v:version == 703 && has('patch629') + setlocal shiftwidth=0 +else + let &l:shiftwidth = &l:tabstop +endif +let b:undo_indent .= '|setlocal shiftwidth<' if &softtabstop != -1 - let &softtabstop = &shiftwidth - let b:undo_indent = 'setlocal softtabstop<' + let &l:softtabstop = &l:shiftwidth + let b:undo_indent .= '|setlocal softtabstop<' endif |