changeset 11297:2db80d94107d v8.0.0534

patch 8.0.0534: defaults.vim does not work well with tiny features commit https://github.com/vim/vim/commit/33ccb24cf7891911561adccf9f2af8859e581198 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 1 16:59:29 2017 +0200 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'.
author Christian Brabandt <cb@256bit.org>
date Sat, 01 Apr 2017 17:00:04 +0200
parents 4e4edcd01046
children df8ae7310164
files runtime/defaults.vim src/version.c
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
+if 1
+  nunmap :
+endif
+
 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start
 
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    534,
+/**/
     533,
 /**/
     532,