diff options
| -rw-r--r-- | runtime/doc/builtin.txt | 6 | ||||
| -rw-r--r-- | src/buffer.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index c1dea37ad0..7df5e9f099 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1179,7 +1179,8 @@ browsedir({title}, {initdir}) browsing is not possible, an empty string is returned. bufadd({name}) *bufadd()* - Add a buffer to the buffer list with String {name}. + Add a buffer to the buffer list with name {name} (must be a + String). If a buffer for file {name} already exists, return that buffer number. Otherwise return the buffer number of the newly created buffer. When {name} is an empty string then a new @@ -1232,7 +1233,8 @@ bufload({buf}) *bufload()* Ensure the buffer {buf} is loaded. When the buffer name refers to an existing file then the file is read. Otherwise the buffer will be empty. If the buffer was already loaded - then there is no change. + then there is no change. If the buffer is not related to a + file the no file is read (e.g., when 'buftype' is "nofile"). If there is an existing swap file for the file of the buffer, there will be no dialog, the buffer will be loaded anyway. The {buf} argument is used like with |bufexists()|. diff --git a/src/buffer.c b/src/buffer.c index fba6c218fd..cfed0f327c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -220,7 +220,10 @@ open_buffer( // mark cursor position as being invalid curwin->w_valid = 0; + // Read the file if there is one. if (curbuf->b_ffname != NULL + && !bt_quickfix(curbuf) + && !bt_nofilename(curbuf) #ifdef FEAT_NETBEANS_INTG && netbeansReadFile #endif diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 38cd7930af..68970407ce 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -2368,6 +2368,13 @@ func Test_bufadd_bufload() exe 'bwipe ' .. buf2 call assert_equal(0, bufexists(buf2)) + " when 'buftype' is "nofile" then bufload() does not read the file + bwipe! XotherName + let buf = bufadd('XotherName') + call setbufvar(buf, '&bt', 'nofile') + call bufload(buf) + call assert_equal([''], getbufline(buf, 1, '$')) + bwipe someName bwipe XotherName call assert_equal(0, bufexists('someName')) diff --git a/src/version.c b/src/version.c index 02c20f03f6..867d971746 100644 --- a/src/version.c +++ b/src/version.c @@ -732,6 +732,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 261, +/**/ 260, /**/ 259, |