diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-16 14:19:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-16 14:19:36 +0100 |
| commit | 0f39a82b07b285e0c54162e1038348b2988a715c (patch) | |
| tree | 04e8a3405857cb1a980962a38af53968ff0476da | |
| parent | b27523ff7ab3083c20c0f33415d890f978726c4f (diff) | |
patch 8.0.0463: side effects from resetting 'compatible' in defaults.vimv8.0.0463
Problem: Resetting 'compatible' in defaults.vim has unexpected side
effects. (David Fishburn)
Solution: Only reset 'compatible' if it was set.
| -rw-r--r-- | runtime/defaults.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 43ff1e0fbe..69668f1c00 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: 2016 Sep 02 +" Last change: 2017 Mar 08 " " This is loaded if no vimrc file was found. " Except when Vim is run with "-u NONE" or "-C". @@ -21,7 +21,10 @@ endif " Use Vim settings, rather than Vi settings (much better!). " This must be first, because it changes other options as a side effect. -set nocompatible +" Avoid side effects when it was already reset. +if &compatible + set nocompatible +endif " Allow backspacing over everything in insert mode. set backspace=indent,eol,start diff --git a/src/version.c b/src/version.c index ff1c9b84a0..c1ac29d92f 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 */ /**/ + 463, +/**/ 462, /**/ 461, |