0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.4.213

Problem:    It's not possible to open a new buffer without creating a swap
            file.
Solution:   Add the ":noswapfile" modifier. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2014-03-23 16:04:02 +01:00
parent f7ff6e85e8
commit 5803ae6c07
6 changed files with 37 additions and 12 deletions

View File

@@ -289,6 +289,9 @@ ml_open(buf)
buf->b_ml.ml_chunksize = NULL;
#endif
if (cmdmod.noswapfile)
buf->b_p_swf = FALSE;
/*
* When 'updatecount' is non-zero swap file may be opened later.
*/
@@ -606,7 +609,7 @@ ml_setname(buf)
* When 'updatecount' is 0 and 'noswapfile' there is no swap file.
* For help files we will make a swap file now.
*/
if (p_uc != 0)
if (p_uc != 0 && !cmdmod.noswapfile)
ml_open_file(buf); /* create a swap file */
return;
}
@@ -719,7 +722,7 @@ ml_open_file(buf)
char_u *dirp;
mfp = buf->b_ml.ml_mfp;
if (mfp == NULL || mfp->mf_fd >= 0 || !buf->b_p_swf)
if (mfp == NULL || mfp->mf_fd >= 0 || !buf->b_p_swf || cmdmod.noswapfile)
return; /* nothing to do */
#ifdef FEAT_SPELL