diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-08-17 20:44:33 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:48 +0300 |
| commit | c57c569000a48ef3f535a325f090607985aa0811 (patch) | |
| tree | b395fc05c4977bf5b7f4dcd2d789fae5ae147334 | |
| parent | 5d47fe124a6a6038975006a306b451d65d267e80 (diff) | |
| download | rneovim-c57c569000a48ef3f535a325f090607985aa0811.tar.gz rneovim-c57c569000a48ef3f535a325f090607985aa0811.tar.bz2 rneovim-c57c569000a48ef3f535a325f090607985aa0811.zip | |
shada: Also expand file name obtained from &shada option
| -rw-r--r-- | src/nvim/shada.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 314fc7e9db..654b6dde41 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -1597,23 +1597,25 @@ static char *shada_filename(const char *file) if (file == NULL || *file == NUL) { if (used_shada_file != NULL) { file = used_shada_file; - } else if ((file = find_shada_parameter('n')) == NULL || *file == NUL) { + } else { + if ((file = find_shada_parameter('n')) == NULL || *file == NUL) { #ifdef SHADA_FILE2 - // don't use $HOME when not defined (turned into "c:/"!). - if (os_getenv((char_u *)"HOME") == NULL) { - // don't use $VIM when not available. - expand_env((char_u *)"$VIM", NameBuff, MAXPATHL); - if (STRCMP("$VIM", NameBuff) != 0) { // $VIM was expanded - file = SHADA_FILE2; + // don't use $HOME when not defined (turned into "c:/"!). + if (os_getenv((char_u *)"HOME") == NULL) { + // don't use $VIM when not available. + expand_env((char_u *)"$VIM", NameBuff, MAXPATHL); + if (STRCMP("$VIM", NameBuff) != 0) { // $VIM was expanded + file = SHADA_FILE2; + } else { + file = SHADA_FILE; + } } else { - file = SHADA_FILE; - } - } else { #endif - file = SHADA_FILE; + file = SHADA_FILE; #ifdef SHADA_FILE2 - } + } #endif + } // XXX It used to be one level lower, so that whatever is in // `used_shada_file` was expanded. I intentionally moved it here // because various expansions must have already be done by the shell. |