aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:28:42 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:28:42 +1300
commit3c5b1c0ea6406a2b6b67bf0c78936c430cf9fd19 (patch)
tree42afe0c87503fde5ac19afa286082f87b3a86e59
parentb8414dbd50096e83a8d71a4ead3aeb6156e7e635 (diff)
downloaddotfiles-3c5b1c0ea6406a2b6b67bf0c78936c430cf9fd19.tar.gz
dotfiles-3c5b1c0ea6406a2b6b67bf0c78936c430cf9fd19.zip
Suppress ~/.vim usage during vimrc version check
-rw-r--r--vim/filetype.vim4
-rw-r--r--vim/vimrc10
2 files changed, 11 insertions, 3 deletions
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
diff --git a/vim/vimrc b/vim/vimrc
index 09b9ca0f..0e489226 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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