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 2460fd8c30f70d87a6250ff652c4fb959bfe2c5d..43ff1e0fbed493fd35017f63e3020533eb0d0f41 100644 (file)
--- 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 40d6dc6b01690bee4043e6e42be7376b50ef675e..0fed162c715719338949afb15432fee8ebdc5564 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2319,
 /**/
     2318,
 /**/