aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-25 17:50:43 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-25 17:50:43 +1200
commit7e3c384bee1ca235a12893b0c5ed64751c3133af (patch)
tree41d7e77ed84371f8709c2210dbccd21bbd83ece9
parentMerge branch 'release/v6.46.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-7e3c384bee1ca235a12893b0c5ed64751c3133af.tar.gz
dotfiles-7e3c384bee1ca235a12893b0c5ed64751c3133af.zip
Merge branch 'release/v6.47.0'v6.47.0
* release/v6.47.0: Reset 'compatible' in stub vimrc
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc.stub4
2 files changed, 6 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 68177cfc..2ec2b044 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.46.0
-Mon, 24 Jun 2019 13:04:23 +0000
+tejr dotfiles v6.47.0
+Tue, 25 Jun 2019 05:50:41 +0000
diff --git a/vim/vimrc.stub b/vim/vimrc.stub
index 29a9e1bf..0be30848 100644
--- a/vim/vimrc.stub
+++ b/vim/vimrc.stub
@@ -5,6 +5,10 @@
" clear, we can load the main vimrc file from ~/.vim/vimrc to use Vim in all
" of its incompatible glory, and then stop sourcing the rest of this file.
"
+" We have to set 'compatible' back to its default because system vimrcs
+" sometimes set it.
+"
+set compatible&
if !&compatible && !exists('$POSIXLY_CORRECT') && v:version >= 700
runtime vimrc
finish