diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-10-17 21:53:16 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-23 14:54:11 +0300 |
| commit | afcc842881d2569c11da26a75057062ba4f124e7 (patch) | |
| tree | 97bfa86757c03ddf4980a7c0a3ffb7983c6bbcb8 /src/nvim/main.c | |
| parent | a82a059921f36fb580026ef4cc31f64c110d07b7 (diff) | |
| download | rneovim-afcc842881d2569c11da26a75057062ba4f124e7.tar.gz rneovim-afcc842881d2569c11da26a75057062ba4f124e7.tar.bz2 rneovim-afcc842881d2569c11da26a75057062ba4f124e7.zip | |
main,version: Remove USR_EXRC_FILE*
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 48e0f48ea6..3c1d59567b 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1834,12 +1834,8 @@ static void source_startup_scripts(mparm_T *parmp) // The first that exists is used, the rest is ignored. char_u *user_vimrc = (char_u *)stdpaths_user_conf_subpath("init.vim"); if (process_env("VIMINIT", true) != OK) { - if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL - && process_env("EXINIT", false) == FAIL - && do_source((char_u *)USR_EXRC_FILE, false, DOSO_NONE) == FAIL) { -#ifdef USR_EXRC_FILE2 - (void)do_source((char_u *)USR_EXRC_FILE2, false, DOSO_NONE); -#endif + if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL) { + process_env("EXINIT", false); } } @@ -1877,14 +1873,7 @@ static void source_startup_scripts(mparm_T *parmp) else secure = 0; #endif - if ( path_full_compare((char_u *)USR_EXRC_FILE, - (char_u *)EXRC_FILE, FALSE) != kEqualFiles -#ifdef USR_EXRC_FILE2 - && path_full_compare((char_u *)USR_EXRC_FILE2, - (char_u *)EXRC_FILE, FALSE) != kEqualFiles -#endif - ) - (void)do_source((char_u *)EXRC_FILE, FALSE, DOSO_NONE); + (void) do_source((char_u *)EXRC_FILE, FALSE, DOSO_NONE); } } xfree(user_vimrc); |