diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-03-01 02:30:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 02:30:05 +0100 |
| commit | e7bd49d835e26c96b2ee152e5b697e20ab749650 (patch) | |
| tree | b02e91d42c8b8a8ef578076ae8bf8deef26b94b5 /src/nvim/main.c | |
| parent | 533d4a36ec03626e9d796ef7e2a9aa3c0e1ce7bf (diff) | |
| parent | 403922b1b47c1f03272e2bdd600dcc02db481389 (diff) | |
| download | rneovim-e7bd49d835e26c96b2ee152e5b697e20ab749650.tar.gz rneovim-e7bd49d835e26c96b2ee152e5b697e20ab749650.tar.bz2 rneovim-e7bd49d835e26c96b2ee152e5b697e20ab749650.zip | |
Merge #7920 'env: use libuv v1.12 getenv/setenv API'
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 251a54ad5b..79513b1c21 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -184,6 +184,7 @@ bool event_teardown(void) void early_init(void) { log_init(); + env_init(); fs_init(); handle_init(); eval_init(); // init global variables @@ -1769,7 +1770,7 @@ static bool do_user_initialization(void) FUNC_ATTR_WARN_UNUSED_RESULT { bool do_exrc = p_exrc; - if (process_env("VIMINIT") == OK) { + if (execute_env("VIMINIT") == OK) { do_exrc = p_exrc; return do_exrc; } @@ -1814,7 +1815,7 @@ static bool do_user_initialization(void) } while (iter != NULL); xfree(config_dirs); } - if (process_env("EXINIT") == OK) { + if (execute_env("EXINIT") == OK) { do_exrc = p_exrc; return do_exrc; } @@ -1878,7 +1879,7 @@ static void source_startup_scripts(const mparm_T *const parmp) /// /// @return FAIL if the environment variable was not executed, /// OK otherwise. -static int process_env(char *env) +static int execute_env(char *env) FUNC_ATTR_NONNULL_ALL { const char *initstr = os_getenv(env); |