changeset 11152:c780e3774dac v8.0.0463

patch 8.0.0463: side effects from resetting 'compatible' in defaults.vim commit https://github.com/vim/vim/commit/0f39a82b07b285e0c54162e1038348b2988a715c Author: Bram Moolenaar <Bram@vim.org> Date: Thu Mar 16 14:19:36 2017 +0100 patch 8.0.0463: side effects from resetting 'compatible' in defaults.vim Problem: Resetting 'compatible' in defaults.vim has unexpected side effects. (David Fishburn) Solution: Only reset 'compatible' if it was set.
author Christian Brabandt <cb@256bit.org>
date Thu, 16 Mar 2017 14:30:04 +0100
parents c3be771b8040
children 11200da8a321
files runtime/defaults.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 2 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:	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
--- 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,