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 2362418a6ba54894f0e8e850252bb0c7ddbbe7d0..9a50cdbec46b65051258931bd3930daea5234bb5 100644 (file)
--- 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 37aa255ce51984cdcca240399b2d23b99ef09b41..f797f41b64f019f4f084b0a2e602027f6f260f47 100644 (file)
--- 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,
 /**/