mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada: Also expand file name obtained from &shada option

Browse Source
This commit is contained in:
ZyX
2015-08-17 20:44:33 +03:00
parent 5d47fe124a
commit c57c569000
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/shada.c
View File

@@ -1597,23 +1597,25 @@ static char *shada_filename(const char *file)
if (file == NULL || *file == NUL) { if (file == NULL || *file == NUL) {
if (used_shada_file != NULL) { if (used_shada_file != NULL) {
file = used_shada_file; 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 #ifdef SHADA_FILE2
// don't use $HOME when not defined (turned into "c:/"!). // don't use $HOME when not defined (turned into "c:/"!).
if (os_getenv((char_u *)"HOME") == NULL) { if (os_getenv((char_u *)"HOME") == NULL) {
// don't use $VIM when not available. // don't use $VIM when not available.
expand_env((char_u *)"$VIM", NameBuff, MAXPATHL); expand_env((char_u *)"$VIM", NameBuff, MAXPATHL);
if (STRCMP("$VIM", NameBuff) != 0) { // $VIM was expanded if (STRCMP("$VIM", NameBuff) != 0) { // $VIM was expanded
file = SHADA_FILE2; file = SHADA_FILE2;
} else {
file = SHADA_FILE;
}
} else { } else {
file = SHADA_FILE;
}
} else {
#endif #endif
file = SHADA_FILE; file = SHADA_FILE;
#ifdef SHADA_FILE2 #ifdef SHADA_FILE2
} }
#endif #endif
}
// XXX It used to be one level lower, so that whatever is in // XXX It used to be one level lower, so that whatever is in
// `used_shada_file` was expanded. I intentionally moved it here // `used_shada_file` was expanded. I intentionally moved it here
// because various expansions must have already be done by the shell. // because various expansions must have already be done by the shell.