summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcos <cos>2018-07-02 10:35:22 +0200
committercos <cos>2018-07-02 10:47:57 +0200
commit15c0d8e45ed16e3fbc84c5ddb8ef6499ed3f6413 (patch)
tree2cdb16d60440967c184d547ed39369301bbd8834
parentd4c0e355c779cb6b91391f7a1133708d1bbfc107 (diff)
downloadvim-15c0d8e45ed16e3fbc84c5ddb8ef6499ed3f6413.zip
Update testcases for nuw=0 and do feature check
-rw-r--r--src/screen.c2
-rw-r--r--src/testdir/gen_opt_test.vim2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index ebc4b2411..6ddd84259 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3901,7 +3901,9 @@ win_line(
#ifdef FEAT_DIFF
+ filler_lines
#endif
+#ifdef FEAT_LINEBREAK
&& wp->w_p_nuw
+#endif
)
{
long num;
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index a742153cd..452ae4352 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -37,7 +37,7 @@ let test_values = {
\ 'imstyle': [[0, 1], [-1, 2, 999]],
\ 'lines': [[2, 24], [-1, 0, 1]],
\ 'linespace': [[0, 2, 4], ['']],
- \ 'numberwidth': [[1, 4, 8, 10], [-1, 0, 11]],
+ \ 'numberwidth': [[0, 1, 4, 8, 10], [-1, 11]],
\ 'regexpengine': [[0, 1, 2], [-1, 3, 999]],
\ 'report': [[0, 1, 2, 9999], [-1]],
\ 'scroll': [[0, 1, 2, 20], [-1]],