From 64caeb13e68c9858ae41ce04131a6f623be5b54d Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 6 Sep 2019 18:05:30 +0200 Subject: stdpaths_get_xdg_var: consider empty env vars #10953 Without this "sysinit uses VIM if XDG_CONFIG_DIRS unset" fails with an existing `/etc/xdg/nvim/sysinit.vim` file, because `XDG_CONFIG_DIRS=` is not considered, but the default ("/etc/xdg") used then. --- src/nvim/os/stdpaths.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index 91ee45d3a9..66bc990402 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -68,6 +68,10 @@ char *stdpaths_get_xdg_var(const XDGVarType idx) if (env_val == NULL && xdg_defaults_env_vars[idx] != NULL) { env_val = os_getenv(xdg_defaults_env_vars[idx]); } +#else + if (env_val == NULL && os_env_exists(env)) { + env_val = ""; + } #endif char *ret = NULL; -- cgit