diff options
author | Bram Moolenaar <Bram@vim.org> | 2004-12-29 21:03:02 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2004-12-29 21:03:02 +0000 |
commit | 8fc061c7f7acb3e80d5fd64d89ad71486d88f5e0 (patch) | |
tree | be2f34900b08a4a8c1dcb404e59452c72ea77a30 /src/memline.c | |
parent | 81695250ef1bbc02016078044ac268129a33f333 (diff) |
updated for version 7.0026v7.0026
Diffstat (limited to 'src/memline.c')
-rw-r--r-- | src/memline.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/memline.c b/src/memline.c index 13f35c2afa..e18b895453 100644 --- a/src/memline.c +++ b/src/memline.c @@ -425,7 +425,8 @@ ml_setname(buf) { if (*dirp == NUL) /* tried all directories, fail */ break; - fname = findswapname(buf, &dirp, mfp->mf_fname); /* alloc's fname */ + fname = findswapname(buf, &dirp, mfp->mf_fname); + /* alloc's fname */ if (fname == NULL) /* no file name found for this dir */ continue; @@ -529,7 +530,7 @@ ml_open_file(buf) /* There is a small chance that between chosing the swap file name and * creating it, another Vim creates the file. In that case the * creation will fail and we will use another directory. */ - fname = findswapname(buf, &dirp, NULL); /* allocates fname */ + fname = findswapname(buf, &dirp, NULL); /* allocates fname */ if (fname == NULL) continue; if (mf_open_file(mfp, fname) == OK) /* consumes fname! */ @@ -3731,7 +3732,8 @@ findswapname(buf, dirp, old_fname) * viewing a help file or when the path of the file is different * (happens when all .swp files are in one directory). */ - if (!recoverymode && buf->b_fname != NULL && !buf->b_help) + if (!recoverymode && buf->b_fname != NULL + && !buf->b_help && !(buf->b_flags & BF_DUMMY)) { int fd; struct block0 b0; |