diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-01 16:59:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-01 16:59:29 +0200 |
| commit | 33ccb24cf7891911561adccf9f2af8859e581198 (patch) | |
| tree | a49c3d8d164c8adaf6b4c6a28618a289644d1c59 | |
| parent | 878c263a489b7e211eda31fa13a3d5ad9e120554 (diff) | |
| download | vim-33ccb24cf7891911561adccf9f2af8859e581198.zip | |
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'.
| -rw-r--r-- | runtime/defaults.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 69668f1c0..f4d22bde4 100644 --- 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 diff --git a/src/version.c b/src/version.c index 651728855..4e91f1486 100644 --- 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, |