patch 7.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.
diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 2460fd8..43ff1e0 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 @@
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 40d6dc6..0fed162 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2319,
+/**/
2318,
/**/
2317,