# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472926506 -7200
# Node ID 1eab38e5cfdf0944e2155154b9dfbfdb17a81ac0
# Parent  cffb4068cb0be7095e85076218c9b539230c81fa
commit https://github.com/vim/vim/commit/b07a82b6d5f904ed3e623e775c3458adb1cc0a3e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Sep 3 20:08:56 2016 +0200

    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
--- 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
--- 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,