aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc.stub.vim23
2 files changed, 14 insertions, 13 deletions
diff --git a/VERSION b/VERSION
index fa075b55..ad9474ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.26.0
-Tue, 18 Jun 2019 03:49:10 +0000
+tejr dotfiles v6.27.0
+Tue, 18 Jun 2019 05:02:23 +0000
diff --git a/vim/vimrc.stub.vim b/vim/vimrc.stub.vim
index 25ca7cf8..a7136aec 100644
--- a/vim/vimrc.stub.vim
+++ b/vim/vimrc.stub.vim
@@ -1,17 +1,18 @@
-" If POSIXLY_CORRECT is defined in the environment, we'll start with
-" 'compatible' enabled if we're not already doing so
-if exists('$POSIXLY_CORRECT') && !&compatible
- set compatible
-endif
-
-" If we have non-tiny Vim version >=7, source real vimrc; this works because
-" tiny and/or ancient builds of Vim quietly ignore all code in :if blocks
-if v:version >= 700 && !&compatible
+" Check that we're not running in 'compatible' mode, nor that the environment
+" calls for the same, and that we're running Vim v7.0.0 or newer. If it's all
+" clear, we can load the main vimrc file from ~/.vim/vimrc, and then stop
+" sourcing the rest of this file.
+"
+if !&compatible && !exists('$POSIXLY_CORRECT') && v:version >= 700
runtime vimrc
finish
endif
-" Otherwise, prevent an old and/or tiny Vim from using any part of our
-" configuration, because parts of it will break
+" If we get this far, it means we're running a tiny, 'compatible', and/or
+" ancient version of Vim. Force 'compatible' on, remove our user runtime
+" directory, and start vi v3.7 from July 1985. Don't grizzle, just use it.
+" It's good for you, like raisin bran.
+"
+set compatible
set runtimepath-=~/.vim
set runtimepath-=~/.vim/after