kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): set local values of window options (#29326)

Browse Source
This commit is contained in:
zeertzjq 2024-06-14 06:20:42 +08:00 committed by GitHub
parent 4a24940980
commit 5def8714ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/lua/vim/_defaults.lua
View File

@ -290,15 +290,15 @@ do
vim.bo.undolevels = -1
vim.bo.scrollback = vim.o.scrollback < 0 and 10000 or math.max(1, vim.o.scrollback)
vim.bo.textwidth = 0
vim.wo.wrap = false
vim.wo.list = false
vim.wo[0][0].wrap = false
vim.wo[0][0].list = false
-- This is gross. Proper list options support when?
local winhl = vim.o.winhighlight
if winhl ~= '' then
winhl = winhl .. ','
end
vim.wo.winhighlight = winhl .. 'StatusLine:StatusLineTerm,StatusLineNC:StatusLineTermNC'
vim.wo[0][0].winhighlight = winhl .. 'StatusLine:StatusLineTerm,StatusLineNC:StatusLineTermNC'
end,
})

2
test/functional/terminal/buffer_spec.lua
View File

@ -196,7 +196,7 @@ describe(':terminal buffer', function()
screen:expect([[
ab^c |
{4:~ }|
{17:========== }|
{5:========== }|
rows: 2, cols: 50 |
{2: } |
{18:========== }|

20
test/functional/terminal/window_spec.lua
View File

@ -12,6 +12,26 @@ local eval = n.eval
local skip = t.skip
local is_os = t.is_os
describe(':terminal window', function()
before_each(clear)
it('sets local values of window options #29325', function()
command('setglobal wrap list')
command('terminal')
eq({ 0, 0, 1 }, eval('[&l:wrap, &wrap, &g:wrap]'))
eq({ 0, 0, 1 }, eval('[&l:list, &list, &g:list]'))
command('enew')
eq({ 1, 1, 1 }, eval('[&l:wrap, &wrap, &g:wrap]'))
eq({ 1, 1, 1 }, eval('[&l:list, &list, &g:list]'))
command('buffer #')
eq({ 0, 0, 1 }, eval('[&l:wrap, &wrap, &g:wrap]'))
eq({ 0, 0, 1 }, eval('[&l:list, &list, &g:list]'))
command('new')
eq({ 1, 1, 1 }, eval('[&l:wrap, &wrap, &g:wrap]'))
eq({ 1, 1, 1 }, eval('[&l:list, &list, &g:list]'))
end)
end)
describe(':terminal window', function()
local screen