From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 29 Jul 2016 16:33:38 +0000 (+0200)
Subject: patch 7.4.2116
X-Git-Tag: v7.4.2116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73e4474b1f1b5b18a8d504eec5305e0c77981f7;p=thirdparty%2Fvim.git

patch 7.4.2116
Problem:    The default vimrc for Windows is very conservative.
Solution:   Use the defaults.vim in the Windows installer.
---

diff --git a/src/dosinst.c b/src/dosinst.c
index 2362418a6b..9a50cdbec4 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -1153,10 +1153,9 @@ install_vimrc(int idx)
 		    fprintf(fd, "set compatible\n");
 		    break;
 	case compat_some_enhancements:
-		    fprintf(fd, "set nocompatible\n");
+		    fprintf(fd, "source $VIMRUNTIME/defaults.vim\n");
 		    break;
 	case compat_all_enhancements:
-		    fprintf(fd, "set nocompatible\n");
 		    fprintf(fd, "source $VIMRUNTIME/vimrc_example.vim\n");
 		    break;
     }
diff --git a/src/version.c b/src/version.c
index 37aa255ce5..f797f41b64 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2116,
 /**/
     2115,
 /**/