commit 305127f9f2f6058b4ec071041a2c98f76114a9b0
author Christian Brabandt <cb@256bit.org> Sat Nov 11 18:59:33 2023 +0100
committer Christian Brabandt <cb@256bit.org> Sat Nov 11 18:59:33 2023 +0100
tree 898b5a1e9e2709046c8c454be777113e6bd0de1a
parent 1b08d2cd0789fd9aaae148a64ff46342730022d7

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>

src/testdir/test_termdebug.vim

diff --git a/src/testdir/test_termdebug.vim b/src/testdir/test_termdebug.vim
index 3b2b8c1..16de057 100644
--- a/src/testdir/test_termdebug.vim
+++ b/src/testdir/test_termdebug.vim
@@ -96,16 +96,22 @@
     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

src/textformat.c

diff --git a/src/textformat.c b/src/textformat.c
index afa94d8..a1a3e16 100644
--- a/src/textformat.c
+++ b/src/textformat.c
@@ -989,7 +989,7 @@
     // 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);

src/version.c

diff --git a/src/version.c b/src/version.c
index e06b086..02d3472 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2100,
+/**/
     2099,
 /**/
     2098,