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: Remove SHADA_FILE2

Browse Source
This commit is contained in:
ZyX
2015-10-17 22:12:21 +03:00
parent fee3c32048
commit 8642bad122
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/shada.c
View File

@@ -1614,23 +1614,8 @@ static char *shada_filename(const char *file)
file = used_shada_file; file = used_shada_file;
} else { } else {
if ((file = find_shada_parameter('n')) == NULL || *file == NUL) { 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;
} else {
file = shada_get_default_file(); file = shada_get_default_file();
} }
} else {
#endif
file = shada_get_default_file();
#ifdef SHADA_FILE2
}
#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.