diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-10 23:44:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-10 23:44:48 +0100 |
| commit | 99ebf22c523e3fdb491b2c92b6f3a7d42721361d (patch) | |
| tree | adbbfce6afde2d201db98feb8413244d4a9d0272 /src | |
| parent | 1e46705a83ef2bbabd4a53ec40108558b73ed54f (diff) | |
patch 8.1.2418: bufnr('$') is wrong after recycling popup bufferv8.1.2418
Problem: bufnr('$') is wrong after recycling popup buffer.
Solution: Sort the buffer list by buffer number. (closes #5335)
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.c | 19 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 38 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index 4f38f918f0..b4992dda07 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2093,6 +2093,25 @@ buflist_new( // buffer number grows rapidly. --buf_reuse.ga_len; buf->b_fnum = ((int *)buf_reuse.ga_data)[buf_reuse.ga_len]; + + // Move buffer to the right place in the buffer list. + while (buf->b_prev != NULL && buf->b_fnum < buf->b_prev->b_fnum) + { + buf_T *prev = buf->b_prev; + + prev->b_next = buf->b_next; + if (prev->b_next != NULL) + prev->b_next->b_prev = prev; + buf->b_next = prev; + buf->b_prev = prev->b_prev; + if (buf->b_prev != NULL) + buf->b_prev->b_next = buf; + prev->b_prev = buf; + if (lastbuf == buf) + lastbuf = prev; + if (firstbuf == prev) + firstbuf = buf; + } } else buf->b_fnum = top_file_num++; diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index dc22743462..5d7f46f9a3 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -3168,4 +3168,21 @@ func Test_popupwin_sign() call delete('XtestPopupSign') endfunc +func Test_popupwin_bufnr() + let popwin = popup_create(['blah'], #{}) + let popbuf = winbufnr(popwin) + split asdfasdf + let newbuf = bufnr() + call assert_true(newbuf > popbuf, 'New buffer number is higher') + call assert_equal(newbuf, bufnr('$')) + call popup_clear() + let popwin = popup_create(['blah'], #{}) + " reuses previous buffer number + call assert_equal(popbuf, winbufnr(popwin)) + call assert_equal(newbuf, bufnr('$')) + + call popup_clear() + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 diff --git a/src/version.c b/src/version.c index 0956f8721b..ecdcb9c7fa 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2418, +/**/ 2417, /**/ 2416, |