diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-20 14:58:36 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-20 14:58:36 +1200 |
commit | f641b01613e71931f950978fe2d1da99947905b4 (patch) | |
tree | a9d83f99b4fd431ed662177461fe86f59abbe439 | |
parent | Merge branch 'release/v6.35.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-f641b01613e71931f950978fe2d1da99947905b4.tar.gz dotfiles-f641b01613e71931f950978fe2d1da99947905b4.zip |
Merge branch 'release/v6.36.0'v6.36.0
* release/v6.36.0:
Correct version number in Vim feature test
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/vimrc.vim | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v6.35.0 -Wed, 19 Jun 2019 23:32:37 +0000 +tejr dotfiles v6.36.0 +Thu, 20 Jun 2019 02:58:36 +0000 diff --git a/vim/vimrc.vim b/vim/vimrc.vim index 977cc05d..60324470 100644 --- a/vim/vimrc.vim +++ b/vim/vimrc.vim @@ -508,7 +508,7 @@ set smarttab " Tab at start of line means indent, otherwise means tab " " <https://github.com/vim/vim/releases/tag/v7.3.693> " -if v:version > 730 || v:version == 730 && has('patch693') +if v:version > 703 || v:version == 703 && has('patch693') set softtabstop=-1 else let &softtabstop = &shiftwidth @@ -620,7 +620,7 @@ set formatoptions+=1 " " <https://github.com/vim/vim/releases/tag/v7.3.541> " -if v:version > 730 || v:version == 730 && has('patch541') +if v:version > 703 || v:version == 703 && has('patch541') set formatoptions+=j endif |