From 33ccb24cf7891911561adccf9f2af8859e581198 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 1 Apr 2017 16:59:29 +0200 Subject: patch 8.0.0534: defaults.vim does not work well with tiny features Problem: Defaults.vim does not work well with tiny features. (crd477) Solution: When the +eval feature is not available always reset 'compatible'. --- runtime/defaults.vim | 12 +++++++++++- src/version.c | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 69668f1c00..f4d22bde49 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ " The default vimrc file. " " Maintainer: Bram Moolenaar -" Last change: 2017 Mar 08 +" Last change: 2017 Apr 01 " " This is loaded if no vimrc file was found. " Except when Vim is run with "-u NONE" or "-C". @@ -26,6 +26,16 @@ if &compatible set nocompatible endif +" When the +eval feature is missing, the set command above will be skipped. +" Use a trick to reset compatible only when the +eval feature is missing. +if 1 + nnoremap : :" +endif +silent normal :set nocompatible +if 1 + nunmap : +endif + " Allow backspacing over everything in insert mode. set backspace=indent,eol,start diff --git a/src/version.c b/src/version.c index 6517288553..4e91f14864 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 534, /**/ 533, /**/ -- cgit v1.2.3