diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-19 16:38:00 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-19 16:38:00 +1300 |
| commit | ac9c5ac60400d7b7432480e174ea287bc8afdea1 (patch) | |
| tree | 25b6bb028e9a6c86be3777ea83348df2fbb6df66 /vim | |
| parent | Merge branch 'release/v3.5.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-3.6.0.tar.gz (sig) dotfiles-3.6.0.zip | |
Merge branch 'release/v3.6.0'v3.6.0
* release/v3.6.0:
Bump VERSION
Make .vimrc stub more resilient to older Vims
Remove redundant links
Update README.md link to msmtp
Use secure URL for Vim website in README.md
Update README.md link to Dunst
Switch to secure link to OpenBSD foundation
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/vimrc.stub.vim | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vim/vimrc.stub.vim b/vim/vimrc.stub.vim index 72c7f7e1..d348bd71 100644 --- a/vim/vimrc.stub.vim +++ b/vim/vimrc.stub.vim @@ -1,14 +1,14 @@ -" If we have Vim version >=7, and (implicitly) +eval, source real vimrc +" If we have non-tiny Vim version >=7, source real vimrc; this works because +" tiny and/or ancient builds of Vim quietly igore all code in :if blocks if v:version >= 700 runtime vimrc + finish +endif -" If not, prevent Vim from using any part of our configuration +" Otherwise, prevent Vim from using any part of our configuration +set runtimepath-=~/.vim +set runtimepath-=~/.vim/after +if has('win32') || has('win64') + set runtimepath-=~/vimfiles + set runtimepath-=~/vimfiles/after else - if has('win32') || has('win64') - set runtimepath-=~/vimfiles - set runtimepath-=~/vimfiles/after - else - set runtimepath-=~/.vim - set runtimepath-=~/.vim/after - endif -endif |