Mercurial > vim
changeset 33753:0839c759c9d1 v9.0.2100
patch 9.0.2100: CI: test_termdebug fails
Commit: https://github.com/vim/vim/commit/305127f9f2f6058b4ec071041a2c98f76114a9b0
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Nov 11 18:59:33 2023 +0100
patch 9.0.2100: CI: test_termdebug fails
Problem: CI: test_termdebug fails
Solution: only test for a changed winlayout, if the window
width actually changed
Also, include an unrelated comment (which doesn't warrant its own patch
number)
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 11 Nov 2023 19:15:10 +0100 |
parents | a141a8fb99b1 |
children | f12a1d112806 |
files | src/testdir/test_termdebug.vim src/textformat.c src/version.c |
diffstat | 3 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_termdebug.vim +++ b/src/testdir/test_termdebug.vim @@ -96,16 +96,22 @@ func Test_termdebug_basic() bw! endif set columns=160 + let winw = winwidth(0) Var - call assert_equal(winnr(), winnr('$') - 1) - call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) - let cn += 1 - bw! + if winwidth(0) < winw + call assert_equal(winnr(), winnr('$') - 1) + call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) + let cn += 1 + bw! + endif + let winw = winwidth(0) Asm - call assert_equal(winnr(), winnr('$') - 1) - call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) - let cn += 1 - bw! + if winwidth(0) < winw + call assert_equal(winnr(), winnr('$') - 1) + call assert_equal(winlayout(), ['col', [['leaf', 1002], ['leaf', 1001], ['row', [['leaf', 1003 + cn], ['leaf', 1000]]]]]) + let cn += 1 + bw! + endif set columns& wincmd t
--- a/src/textformat.c +++ b/src/textformat.c @@ -989,7 +989,7 @@ format_lines( // length of a line to force formatting: 3 * 'tw' max_len = comp_textwidth(TRUE) * 3; - // check for 'q', '2' and '1' in 'formatoptions' + // check for 'q', '2', 'n' and 'w' in 'formatoptions' do_comments = has_format_option(FO_Q_COMS); do_second_indent = has_format_option(FO_Q_SECOND); do_number_indent = has_format_option(FO_Q_NUMBER);