diff options
| -rw-r--r-- | src/testdir/test_termdebug.vim | 22 | ||||
| -rw-r--r-- | src/textformat.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/testdir/test_termdebug.vim b/src/testdir/test_termdebug.vim index 3b2b8c1afd..16de057803 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 afa94d8812..a1a3e161ac 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 e06b0864cf..02d3472e64 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2100, +/**/ 2099, /**/ 2098, |