diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-10-17 22:12:21 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-23 14:54:11 +0300 |
| commit | 8642bad122dd8b79983d42fbdf12524db9236aa2 (patch) | |
| tree | d53b5e3659fd0344a45a80f378a4d94da7439964 | |
| parent | fee3c320484f8444b6b078bdff6777a7aac31c89 (diff) | |
| download | rneovim-8642bad122dd8b79983d42fbdf12524db9236aa2.tar.gz rneovim-8642bad122dd8b79983d42fbdf12524db9236aa2.tar.bz2 rneovim-8642bad122dd8b79983d42fbdf12524db9236aa2.zip | |
shada: Remove SHADA_FILE2
| -rw-r--r-- | src/nvim/shada.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index d6cbba4b12..bb79c183e6 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -1614,22 +1614,7 @@ static char *shada_filename(const char *file) file = used_shada_file; } 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; - } else { - file = shada_get_default_file(); - } - } else { -#endif - file = shada_get_default_file(); -#ifdef SHADA_FILE2 - } -#endif + file = shada_get_default_file(); } // XXX It used to be one level lower, so that whatever is in // `used_shada_file` was expanded. I intentionally moved it here |