mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 22:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1288: Using wrong window in ll_resize_stack() (#33397)

Browse Source 
Problem:  Using wrong window in ll_resize_stack()
          (after v9.1.1287)
Solution: Use "wp" instead of "curwin", even though they are always the
          same value.  Fix typos in documentation (zeertzjq).

closes: vim/vim#17080

b71f1309a2
This commit is contained in:
zeertzjq
2025-04-09 07:40:55 +08:00
committed by GitHub
parent 3647b821ea
commit c73a827564
4 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/doc/options.txt
View File

@@ -3794,13 +3794,12 @@ A jump table for the options with a short description can be found at |Q_op|.
*'lhistory'* *'lhi'* *'lhistory'* *'lhi'*
'lhistory' 'lhi' number (default 10) 'lhistory' 'lhi' number (default 10)
local to window local to window
Like 'chistory', but for the location list stack associated with the Like 'chistory', but for the location list stack associated with a
current window. If the option is changed in either the location list window. If the option is changed in either the location list window
window itself or the the window that is associated with the location itself or the window that is associated with the location list stack,
list stack, the new value will also be applied to the other one. This the new value will also be applied to the other one. This means this
means this value will always be the same for a given location list value will always be the same for a given location list window and its
window and its corresponding window. See |quickfix-stack| for corresponding window. See |quickfix-stack| for additional info.
additional info.
*'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'* *'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
'linebreak' 'lbr' boolean (default off) 'linebreak' 'lbr' boolean (default off)

13
runtime/lua/vim/_meta/options.lua generated
View File

@@ -3744,13 +3744,12 @@ vim.o.lz = vim.o.lazyredraw
vim.go.lazyredraw = vim.o.lazyredraw vim.go.lazyredraw = vim.o.lazyredraw
vim.go.lz = vim.go.lazyredraw vim.go.lz = vim.go.lazyredraw
--- Like 'chistory', but for the location list stack associated with the --- Like 'chistory', but for the location list stack associated with a
--- current window. If the option is changed in either the location list --- window. If the option is changed in either the location list window
--- window itself or the the window that is associated with the location --- itself or the window that is associated with the location list stack,
--- list stack, the new value will also be applied to the other one. This --- the new value will also be applied to the other one. This means this
--- means this value will always be the same for a given location list --- value will always be the same for a given location list window and its
--- window and its corresponding window. See `quickfix-stack` for --- corresponding window. See `quickfix-stack` for additional info.
--- additional info.
--- ---
--- @type integer --- @type integer
vim.o.lhistory = 10 vim.o.lhistory = 10

13
src/nvim/options.lua
View File

@@ -5046,13 +5046,12 @@ local options = {
cb = 'did_set_xhistory', cb = 'did_set_xhistory',
defaults = 10, defaults = 10,
desc = [=[ desc = [=[
Like 'chistory', but for the location list stack associated with the Like 'chistory', but for the location list stack associated with a
current window. If the option is changed in either the location list window. If the option is changed in either the location list window
window itself or the the window that is associated with the location itself or the window that is associated with the location list stack,
list stack, the new value will also be applied to the other one. This the new value will also be applied to the other one. This means this
means this value will always be the same for a given location list value will always be the same for a given location list window and its
window and its corresponding window. See |quickfix-stack| for corresponding window. See |quickfix-stack| for additional info.
additional info.
]=], ]=],
full_name = 'lhistory', full_name = 'lhistory',
scope = { 'win' }, scope = { 'win' },

5
src/nvim/quickfix.c
View File

@@ -2011,9 +2011,9 @@ void qf_resize_stack(int n)
/// Resize location list stack for window 'wp' to be able to hold n amount of lists. /// Resize location list stack for window 'wp' to be able to hold n amount of lists.
void ll_resize_stack(win_T *wp, int n) void ll_resize_stack(win_T *wp, int n)
{ {
// check if current window is a location list window; // check if given window is a location list window;
// if so then sync its 'lhistory' to the parent window or vice versa // if so then sync its 'lhistory' to the parent window or vice versa
if (IS_LL_WINDOW(curwin)) { if (IS_LL_WINDOW(wp)) {
qf_sync_llw_to_win(wp); qf_sync_llw_to_win(wp);
} else { } else {
qf_sync_win_to_llw(wp); qf_sync_win_to_llw(wp);
@@ -2107,7 +2107,6 @@ static qf_info_T *qf_alloc_stack(qfltype_T qfltype, int n)
} }
/// Allocate memory for qf_lists member of qf_info_T struct. /// Allocate memory for qf_lists member of qf_info_T struct.
/// 'actual' is the actual amount of lists that have been allocated for
static qf_list_T *qf_alloc_list_stack(int n) static qf_list_T *qf_alloc_list_stack(int n)
FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_RET
{ {