diff --git a/src/memline.c b/src/memline.c index 74f94ed41..84ce2d585 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1404,15 +1404,22 @@ recover_names(fname, list, nr) int i; char_u *dirp; char_u *dir_name; - char_u *fname_res = *fname; + char_u *fname_res = NULL; #ifdef HAVE_READLINK char_u fname_buf[MAXPATHL]; +#endif + if (fname != NULL) + { +#ifdef HAVE_READLINK /* Expand symlink in the file name, because the swap file is created with * the actual file instead of with the symlink. */ if (resolve_symlink(*fname, fname_buf) == OK) fname_res = fname_buf; + else #endif + fname_res = *fname; + } if (list) { diff --git a/src/version.c b/src/version.c index 7a0642a22..31a49be37 100644 --- a/src/version.c +++ b/src/version.c @@ -681,6 +681,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 438, /**/ 437, /**/