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'.

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 69668f1c00eb4c26f4c9cc81b1a789dbb7c7ddf7..f4d22bde494ecc573d6cf733ccf8ae0d2a4958f9 100644 (file)
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" 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\r
+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 65172885530aa27eb1e779b8748646ba727cc301..4e91f14864602983db1106a8fca71e98d86fb152 100644 (file)
--- 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,
 /**/