diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-10-28 23:24:55 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-28 23:24:55 -0400 |
| commit | 98b5ec565b955687ad7e2914378d999975b841df (patch) | |
| tree | 6f78984d364f71d0f17d71747285970dd643ee2a /src | |
| parent | dc8b0c47b10a5a7a1280a768b181f23bd990ab6e (diff) | |
| parent | dbef4111edede31ab836752ab2d410c081c3ad9a (diff) | |
| download | rneovim-98b5ec565b955687ad7e2914378d999975b841df.tar.gz rneovim-98b5ec565b955687ad7e2914378d999975b841df.tar.bz2 rneovim-98b5ec565b955687ad7e2914378d999975b841df.zip | |
Merge pull request #3554 from ovidiu/fix-exrc-option
Fix the 'exrc' option
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index eb2a1567e7..43723ff363 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1601,10 +1601,12 @@ static bool do_user_initialization(void) { bool do_exrc = p_exrc; if (process_env("VIMINIT", true) == OK) { + do_exrc = p_exrc; return do_exrc; } char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim"); if (do_source(user_vimrc, true, DOSO_VIMRC) != FAIL) { + do_exrc = p_exrc; if (do_exrc) { do_exrc = (path_full_compare((char_u *)VIMRC_FILE, user_vimrc, false) != kEqualFiles); @@ -1630,6 +1632,7 @@ static bool do_user_initialization(void) vimrc[dir_len] = PATHSEP; memmove(vimrc + dir_len + 1, path_tail, sizeof(path_tail)); if (do_source((char_u *) vimrc, true, DOSO_VIMRC) != FAIL) { + do_exrc = p_exrc; if (do_exrc) { do_exrc = (path_full_compare((char_u *)VIMRC_FILE, (char_u *)vimrc, false) != kEqualFiles); @@ -1643,6 +1646,7 @@ static bool do_user_initialization(void) xfree(config_dirs); } if (process_env("EXINIT", false) == OK) { + do_exrc = p_exrc; return do_exrc; } return do_exrc; |