mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21652 from neovim/backport-21650-to-release-0.8

Browse Source 
[Backport release-0.8] fix(diff): avoid restoring invalid 'foldcolumn' value
This commit is contained in:
zeertzjq
2023-01-05 10:02:01 +08:00
committed by GitHub
parent f427fc780d 4a52467f77
commit 2b512a1d25
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/diff.c
View File

@@ -1482,7 +1482,7 @@ void ex_diffoff(exarg_T *eap)
free_string_option(wp->w_p_fdm);
wp->w_p_fdm = xstrdup(*wp->w_p_fdm_save ? wp->w_p_fdm_save : "manual");
free_string_option(wp->w_p_fdc);
wp->w_p_fdc = xstrdup(wp->w_p_fdc_save);
wp->w_p_fdc = xstrdup(*wp->w_p_fdc_save ? wp->w_p_fdc_save : "0");
if (wp->w_p_fdl == 0) {
wp->w_p_fdl = wp->w_p_fdl_save;

22
test/functional/ui/diff_spec.lua
View File

@@ -8,6 +8,8 @@ local insert = helpers.insert
local write_file = helpers.write_file
local dedent = helpers.dedent
local exec = helpers.exec
local eq = helpers.eq
local meths = helpers.meths
describe('Diff mode screen', function()
local fname = 'Xtest-functional-diff-screen-1'
@@ -1315,6 +1317,26 @@ it('Align the filler lines when changing text in diff mode', function()
]]}
end)
it("diff mode doesn't restore invalid 'foldcolumn' value #21647", function()
clear()
local screen = Screen.new(60, 6)
screen:set_default_attr_ids({
[0] = {foreground = Screen.colors.Blue, bold = true};
})
screen:attach()
eq('0', meths.get_option_value('foldcolumn', {}))
command('diffsplit | bd')
screen:expect([[
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]])
eq('0', meths.get_option_value('foldcolumn', {}))
end)
-- oldtest: Test_diff_binary()
it('diff mode works properly if file contains NUL bytes vim-patch:8.2.3925', function()
clear()