diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-03 20:08:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-03 20:08:56 +0200 |
| commit | b07a82b6d5f904ed3e623e775c3458adb1cc0a3e (patch) | |
| tree | 8adb761bb223181da7781df64131549a2b862e8e | |
| parent | 349e7d94e6bbb253bb87adad9039f095128ab543 (diff) | |
| download | vim-git-7.4.2319.tar.gz | |
patch 7.4.2319v7.4.2319
Problem: No way for a system wide vimrc to stop loading defaults.vim.
(Christian Hesse)
Solution: Bail out of defaults.vim if skip_defaults_vim was set.
| -rw-r--r-- | runtime/defaults.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 2460fd8c3..43ff1e0fb 100644 --- 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 Aug 28 +" Last change: 2016 Sep 02 " " This is loaded if no vimrc file was found. " Except when Vim is run with "-u NONE" or "-C". @@ -13,6 +13,12 @@ if v:progname =~? "evim" finish endif +" Bail out if something that ran earlier, e.g. a system wide vimrc, does not +" want Vim to use these default values. +if exists('skip_defaults_vim') + finish +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 diff --git a/src/version.c b/src/version.c index 40d6dc6b0..0fed162c7 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2319, +/**/ 2318, /**/ 2317, |