kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'exrc' option

Browse Source 
`do_user_initialization()` ignored changes to the value of the `exrc` option
caused by the processing of environment variables or sourcing of files.
This commit is contained in:
Ovidiu Curcan 2015-10-29 02:28:07 +01:00
parent dc8b0c47b1
commit dbef4111ed
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/main.c
View File

@ -1601,10 +1601,12 @@ static bool do_user_initialization(void)
{ {
bool do_exrc = p_exrc; bool do_exrc = p_exrc;
if (process_env("VIMINIT", true) == OK) { if (process_env("VIMINIT", true) == OK) {
do_exrc = p_exrc;
return do_exrc; return do_exrc;
} }
char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim"); char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim");
if (do_source(user_vimrc, true, DOSO_VIMRC) != FAIL) { if (do_source(user_vimrc, true, DOSO_VIMRC) != FAIL) {
do_exrc = p_exrc;
if (do_exrc) { if (do_exrc) {
do_exrc = (path_full_compare((char_u *)VIMRC_FILE, user_vimrc, false) do_exrc = (path_full_compare((char_u *)VIMRC_FILE, user_vimrc, false)
!= kEqualFiles); != kEqualFiles);
@ -1630,6 +1632,7 @@ static bool do_user_initialization(void)
vimrc[dir_len] = PATHSEP; vimrc[dir_len] = PATHSEP;
memmove(vimrc + dir_len + 1, path_tail, sizeof(path_tail)); memmove(vimrc + dir_len + 1, path_tail, sizeof(path_tail));
if (do_source((char_u *) vimrc, true, DOSO_VIMRC) != FAIL) { if (do_source((char_u *) vimrc, true, DOSO_VIMRC) != FAIL) {
do_exrc = p_exrc;
if (do_exrc) { if (do_exrc) {
do_exrc = (path_full_compare((char_u *)VIMRC_FILE, (char_u *)vimrc, do_exrc = (path_full_compare((char_u *)VIMRC_FILE, (char_u *)vimrc,
false) != kEqualFiles); false) != kEqualFiles);
@ -1643,6 +1646,7 @@ static bool do_user_initialization(void)
xfree(config_dirs); xfree(config_dirs);
} }
if (process_env("EXINIT", false) == OK) { if (process_env("EXINIT", false) == OK) {
do_exrc = p_exrc;
return do_exrc; return do_exrc;
} }
return do_exrc; return do_exrc;