Permalink
Browse files

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.
  • Loading branch information...
1 parent 349e7d9 commit b07a82b6d5f904ed3e623e775c3458adb1cc0a3e @brammool brammool committed Sep 3, 2016
Showing with 9 additions and 1 deletion.
  1. +7 −1 runtime/defaults.vim
  2. +2 −0 src/version.c
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2319,
+/**/
2318,
/**/
2317,

0 comments on commit b07a82b

Please sign in to comment.