From b07a82b6d5f904ed3e623e775c3458adb1cc0a3e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 3 Sep 2016 20:08:56 +0200 Subject: 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. --- runtime/defaults.vim | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'runtime') diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 2460fd8c30..43ff1e0fbe 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ " The default vimrc file. " " Maintainer: Bram Moolenaar -" 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 -- cgit v1.2.3