diff options
Diffstat (limited to 'vim/after')
-rw-r--r-- | vim/after/indent/c.vim | 14 | ||||
-rw-r--r-- | vim/after/indent/gitconfig.vim | 12 | ||||
-rw-r--r-- | vim/after/indent/make.vim | 18 |
3 files changed, 33 insertions, 11 deletions
diff --git a/vim/after/indent/c.vim b/vim/after/indent/c.vim index ad01aceb..9cea0a2d 100644 --- a/vim/after/indent/c.vim +++ b/vim/after/indent/c.vim @@ -1,9 +1,15 @@ -" Use hard tabs for C +" Use plain old tabs for indent in C files 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 &l:softtabstop = &l:shiftwidth let b:undo_indent .= '|setlocal softtabstop<' endif diff --git a/vim/after/indent/gitconfig.vim b/vim/after/indent/gitconfig.vim index ff1654e5..943e78ea 100644 --- a/vim/after/indent/gitconfig.vim +++ b/vim/after/indent/gitconfig.vim @@ -1,9 +1,15 @@ " Use tabs for indent in Git config files, rather than fighting with the " frontend tool 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 &l:softtabstop = &l:shiftwidth let b:undo_indent .= '|setlocal softtabstop<' endif diff --git a/vim/after/indent/make.vim b/vim/after/indent/make.vim index 341cd7f6..d45487b4 100644 --- a/vim/after/indent/make.vim +++ b/vim/after/indent/make.vim @@ -1,4 +1,14 @@ -" Use 'tabstop' (8 columns, a full tab) for indent operations in Makefiles. -" It seems odd that the stock plugin doesn't force this on its own. -setlocal shiftwidth=0 -let b:undo_indent = 'setlocal shiftwidth<' +" Use plain old tabs for Makefiles (of course) +setlocal noexpandtab +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<' +endif |