summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-29 18:33:38 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-29 18:33:38 +0200
commitc73e4474b1f1b5b18a8d504eec5305e0c77981f7 (patch)
tree7ccf28d6938c39cf6660016ea1bbaaaf432e3c64
parentb9a46fec3e79d1fc8c406084a41733c647a5e535 (diff)
patch 7.4.2116v7.4.2116
Problem: The default vimrc for Windows is very conservative. Solution: Use the defaults.vim in the Windows installer.
-rw-r--r--src/dosinst.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
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
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2116,
+/**/
2115,
/**/
2114,