diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-07-29 18:33:38 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-07-29 18:33:38 +0200 |
commit | c73e4474b1f1b5b18a8d504eec5305e0c77981f7 (patch) | |
tree | 7ccf28d6938c39cf6660016ea1bbaaaf432e3c64 | |
parent | b9a46fec3e79d1fc8c406084a41733c647a5e535 (diff) | |
download | vim-git-c73e4474b1f1b5b18a8d504eec5305e0c77981f7.tar.gz |
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.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/dosinst.c b/src/dosinst.c index 2362418a6..9a50cdbec 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 37aa255ce..f797f41b6 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, |