diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-05-18 19:33:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 19:33:28 +0200 |
| commit | 2ed2939597d217f12f9f6da1877684703aa9301f (patch) | |
| tree | a8f07a3e7539dcd781b29df6cdc4719551ab655c /src/nvim/os/stdpaths.c | |
| parent | 0ed297bdb495fa072053b3e28e0c504c7107cf5c (diff) | |
| parent | 91c4de83c9de9049fc706f319deea38e9436502e (diff) | |
| download | rneovim-2ed2939597d217f12f9f6da1877684703aa9301f.tar.gz rneovim-2ed2939597d217f12f9f6da1877684703aa9301f.tar.bz2 rneovim-2ed2939597d217f12f9f6da1877684703aa9301f.zip | |
Merge #8406 'stdpath(): handle NULL default values'
Diffstat (limited to 'src/nvim/os/stdpaths.c')
| -rw-r--r-- | src/nvim/os/stdpaths.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index 866a005228..f6503dfdb0 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -65,7 +65,7 @@ char *stdpaths_get_xdg_var(const XDGVarType idx) const char *env_val = os_getenv(env); #ifdef WIN32 - if (env_val == NULL) { + if (env_val == NULL && xdg_defaults_env_vars[idx] != NULL) { env_val = os_getenv(xdg_defaults_env_vars[idx]); } #endif @@ -74,7 +74,7 @@ char *stdpaths_get_xdg_var(const XDGVarType idx) if (env_val != NULL) { ret = xstrdup(env_val); } else if (fallback) { - ret = (char *) expand_env_save((char_u *)fallback); + ret = (char *)expand_env_save((char_u *)fallback); } return ret; |