Skip to content

Commit b07a82b

Browse files
committed
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.
1 parent 349e7d9 commit b07a82b

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

runtime/defaults.vim

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" The default vimrc file.
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last change: 2016 Aug 28
4+
" Last change: 2016 Sep 02
55
"
66
" This is loaded if no vimrc file was found.
77
" Except when Vim is run with "-u NONE" or "-C".
@@ -13,6 +13,12 @@ if v:progname =~? "evim"
1313
finish
1414
endif
1515

16+
" Bail out if something that ran earlier, e.g. a system wide vimrc, does not
17+
" want Vim to use these default values.
18+
if exists('skip_defaults_vim')
19+
finish
20+
endif
21+
1622
" Use Vim settings, rather than Vi settings (much better!).
1723
" This must be first, because it changes other options as a side effect.
1824
set nocompatible

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2319,
766768
/**/
767769
2318,
768770
/**/

0 commit comments

Comments
 (0)