diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-05-15 16:11:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 16:11:01 +0200 |
| commit | 597d65b4b7e10e3155837c3962e35283fc414d8d (patch) | |
| tree | 460d308091e7b6d0a43bf0d7b7a597b42a20f9ba /src/nvim/main.c | |
| parent | 8e052f677ee80414a4ef635afb5ce0f323f602f3 (diff) | |
| parent | cc5a42a77485cc09f6215326d3b5ed1ec139fba6 (diff) | |
| download | rneovim-597d65b4b7e10e3155837c3962e35283fc414d8d.tar.gz rneovim-597d65b4b7e10e3155837c3962e35283fc414d8d.tar.bz2 rneovim-597d65b4b7e10e3155837c3962e35283fc414d8d.zip | |
Merge #6741 from justinmk/progpath
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 40b553e93c..3831f0ac6b 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1223,7 +1223,8 @@ static void init_path(char *exename) size_t exepathlen = MAXPATHL; // Make v:progpath absolute. if (os_exepath(exepath, &exepathlen) != 0) { - EMSG2(e_intern2, "init_path()"); + // Fall back to argv[0]. Missing procfs? #6734 + path_guess_exepath(exename, exepath, sizeof(exepath)); } set_vim_var_string(VV_PROGPATH, exepath, -1); set_vim_var_string(VV_PROGNAME, (char *)path_tail((char_u *)exename), -1); @@ -1684,7 +1685,7 @@ static bool do_user_initialization(void) do { const char *dir; size_t dir_len; - iter = vim_colon_env_iter(config_dirs, iter, &dir, &dir_len); + iter = vim_env_iter(':', config_dirs, iter, &dir, &dir_len); if (dir == NULL || dir_len == 0) { break; } |