From 3c5b1c0ea6406a2b6b67bf0c78936c430cf9fd19 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 30 Nov 2018 14:28:42 +1300 Subject: Suppress ~/.vim usage during vimrc version check --- vim/filetype.vim | 4 ++-- vim/vimrc | 10 +++++++++- 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 -- cgit v1.2.3 From 0ba99d231902fd23f2ba2eb3c4d6b3bbe8f1e5d9 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 30 Nov 2018 14:28:53 +1300 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a4da619e..6b1703dc 100644 --- a/VERSION +++ b/VERSION @@ -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 -- cgit v1.2.3