diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 14:28:54 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 14:28:54 +1300 |
commit | 6bc6744f0a42ed7ae04bdbf3c58bb11e770c0ac1 (patch) | |
tree | 91da45f44d4474f47a8e02ed831f11f69742a4eb | |
parent | Merge branch 'release/v2.3.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-6bc6744f0a42ed7ae04bdbf3c58bb11e770c0ac1.tar.gz dotfiles-6bc6744f0a42ed7ae04bdbf3c58bb11e770c0ac1.zip |
Merge branch 'release/v2.4.0'v2.4.0
* release/v2.4.0:
Bump VERSION
Suppress ~/.vim usage during vimrc version check
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/filetype.vim | 4 | ||||
-rw-r--r-- | vim/vimrc | 10 |
3 files changed, 13 insertions, 5 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v2.3.0 -Fri Nov 30 01:21:49 UTC 2018 +tejr dotfiles v2.4.0 +Fri Nov 30 01:28:53 UTC 2018 diff --git a/vim/filetype.vim b/vim/filetype.vim index cc0de4e4..2e20b744 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -1,5 +1,5 @@ -" Override system filetype.vim if sufficiently new -if exists('g:did_load_filetypes') || v:version < 700 +" Override system filetype.vim +if exists('g:did_load_filetypes') finish endif let g:did_load_filetypes = 1 @@ -3,8 +3,16 @@ " This file is designed to load on any build of Vim version 7.0 or newer, " including tiny builds without +eval. -" Require at least Vim 7.0 (released 2006-05-08) +" Require at least Vim 7.0 (released 2006-05-08); otherwise, self-suppress as +" much of this config as possible if v:version < 700 + if has('win32') || has('win64') + set runtimepath-=~/vimfiles + set runtimepath-=~/vimfiles/after + else + set runtimepath-=~/.vim + set runtimepath-=~/.vim/after + endif finish endif |