diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-25 17:51:32 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-25 17:51:32 +1200 |
commit | 19ac90f2850bff6580728afbdaa63b37f8fb17b8 (patch) | |
tree | c686cfdea9b42543b7245437324356048b47ec1d | |
parent | Merge branch 'release/v6.47.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-19ac90f2850bff6580728afbdaa63b37f8fb17b8.tar.gz dotfiles-19ac90f2850bff6580728afbdaa63b37f8fb17b8.zip |
Merge branch 'release/v6.48.0'v6.48.0
* release/v6.48.0:
Revert "Reset 'compatible' in stub vimrc"
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/vimrc.stub | 4 |
2 files changed, 2 insertions, 6 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v6.47.0 -Tue, 25 Jun 2019 05:50:41 +0000 +tejr dotfiles v6.48.0 +Tue, 25 Jun 2019 05:51:31 +0000 diff --git a/vim/vimrc.stub b/vim/vimrc.stub index 0be30848..29a9e1bf 100644 --- a/vim/vimrc.stub +++ b/vim/vimrc.stub @@ -5,10 +5,6 @@ " 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 |