patch 9.0.2100: CI: test_termdebug fails
Commit:
https://github.com/vim/vim/commit/305127f9f2f6058b4ec071041a2c98f76114a9b0
Author: Christian Brabandt <c...@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 <c...@256bit.org>
diff --git a/src/testdir/test_termdebug.vim b/src/testdir/test_termdebug.vim
index 3b2b8c1af..16de05780 100644
--- 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
diff --git a/src/textformat.c b/src/textformat.c
index afa94d881..a1a3e161a 100644
--- 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);
diff --git a/src/version.c b/src/version.c
index e06b0864c..02d3472e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 2100,
/**/
2099,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1r1sVj-001Dvx-Am%40256bit.org.
