adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1599: :bnext doesn't go to unlisted help buffers

Browse Source 
Problem:  :bnext doesn't go to unlisted help buffers when cycling
          through help buffers (after 9.1.0557).
Solution: Don't check if a help buffer is listed (zeertzjq).

From <https://github.com/vim/vim/issues/4478#issuecomment-498831057>:

> I think we should fix that, since once you get to a non-help buffer
> all unlisted buffers are skipped, thus you won't encounter another
> help buffer.

This implies that cycling through help buffers should work even if help
buffers are unlisted. Otherwise this part of :bnext isn't really useful,
as :h makes help buffers unlisted by default.

related: #4478
related: #15198
closes: #17913

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-08-07 15:24:29 +02:00
committed by Christian Brabandt
parent 9c4de84b2d
commit 9662f33480
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/buffer.c
View File

@ -1371,8 +1371,11 @@ do_buffer_ext(
}
else
{
int help_only = (flags & DOBUF_SKIPHELP) != 0 && buf->b_help;
bp = NULL;
while (count > 0 || (!unload && !buf->b_p_bl && bp != buf))
while (count > 0 || (bp != buf && !unload
&& !(help_only ? buf->b_help : buf->b_p_bl)))
{
// remember the buffer where we start, we come back there when all
// buffers are unlisted.
@ -1390,14 +1393,17 @@ do_buffer_ext(
if (buf == NULL)
buf = lastbuf;
}
// Avoid non-help buffers if the starting point was a help buffer
// and vice-versa.
// Don't count unlisted buffers.
// Avoid non-help buffers if the starting point was a non-help buffer and
// vice-versa.
if (unload || (buf->b_p_bl
&& ((flags & DOBUF_SKIPHELP) == 0 || buf->b_help == bp->b_help)))
if (unload
|| (help_only
? buf->b_help
: (buf->b_p_bl && ((flags & DOBUF_SKIPHELP) == 0
|| !buf->b_help))))
{
--count;
bp = NULL; // use this buffer as new starting point
--count;
bp = NULL; // use this buffer as new starting point
}
if (bp == buf)
{

11
src/testdir/test_buffer.vim
View File

@ -167,6 +167,17 @@ func Test_bnext_bprev_help()
b XHelp1
blast | call assert_equal(b4, bufnr())
" Cycling through help buffers works even if they aren't listed.
b XHelp1
setlocal nobuflisted
bnext | call assert_equal(b3, bufnr())
bnext | call assert_equal(b1, bufnr())
bprev | call assert_equal(b3, bufnr())
setlocal nobuflisted
bprev | call assert_equal(b1, bufnr())
bprev | call assert_equal(b3, bufnr())
bnext | call assert_equal(b1, bufnr())
%bwipe!
endfunc

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1599,
/**/
1598,
/**/