diff options
| author | Daniel Hahler <git@thequod.de> | 2019-10-19 23:11:31 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-10-19 14:11:31 -0700 |
| commit | 3de4dc539ae938c5fdeddbdf25722fd1f6d9c77c (patch) | |
| tree | 06f93f207141a372a02f513e4adb11a3ecea7e37 /src | |
| parent | 68b0873c458f4a0b5ca8483958994d338060202a (diff) | |
| download | rneovim-3de4dc539ae938c5fdeddbdf25722fd1f6d9c77c.tar.gz rneovim-3de4dc539ae938c5fdeddbdf25722fd1f6d9c77c.tar.bz2 rneovim-3de4dc539ae938c5fdeddbdf25722fd1f6d9c77c.zip | |
vim-patch:8.1.2180: Error E303 is not useful when 'directory' is empty (#11257)
Problem: Error E303 is not useful when 'directory' is empty.
Solution: Skip the error message. (Daniel Hahler, vim/vim#5067)
https://github.com/vim/vim/commit/00e192becd50a38cb21a1bc3f86fcc7a21f8ee88
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/memline.c | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_recover.vim | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index f1d6ee064c..b85c23e50f 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -523,9 +523,9 @@ void ml_open_file(buf_T *buf) } } - if (mfp->mf_fname == NULL) { /* Failed! */ - need_wait_return = TRUE; /* call wait_return later */ - ++no_wait_return; + if (*p_dir != NUL && mfp->mf_fname == NULL) { + need_wait_return = true; // call wait_return later + no_wait_return++; (void)EMSG2(_( "E303: Unable to open swap file for \"%s\", recovery impossible"), buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname); diff --git a/src/nvim/testdir/test_recover.vim b/src/nvim/testdir/test_recover.vim index 09c8d1cda6..fc073cacd2 100644 --- a/src/nvim/testdir/test_recover.vim +++ b/src/nvim/testdir/test_recover.vim @@ -14,6 +14,12 @@ func Test_recover_root_dir() set dir=/notexist/ endif call assert_fails('split Xtest', 'E303:') + + " No error with empty 'directory' setting. + set directory= + split XtestOK + close! + set dir& endfunc |