diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-23 01:26:12 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-23 01:26:12 +1200 |
commit | 87f5f379d52ffa0a4fb8662788fc28a4a5028dc3 (patch) | |
tree | 3d606b1c105a91e7204eed0cddd9ed03f08f9f52 /vim/after/indent/gitconfig.vim | |
parent | Merge branch 'release/v6.37.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-6.38.0.tar.gz (sig) dotfiles-6.38.0.zip |
Merge branch 'release/v6.38.0'v6.38.0
* release/v6.38.0:
Update paste_insert.vim to v0.3.0
Use tr() over substitute() for character swap
Fix up some pattern qualifiers
Update digraph_search.vim to v1.1.0
Correct indent settings
Don't squeeze blanks by default in mail filetype
Improve honesty of comment in mail ftplugin
Move mail ftplugin function out into autoload
Add local maps for normalising mail quotes
Don't do :StrictQuote automatically on mail edit
Make :StrictQuote command accept a range
Diffstat (limited to 'vim/after/indent/gitconfig.vim')
-rw-r--r-- | vim/after/indent/gitconfig.vim | 12 |
1 files changed, 9 insertions, 3 deletions
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 |