summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-24 15:12:37 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-24 15:12:37 +0200
commit28686682e77c0cca963201ae671bd773d86dba31 (patch)
tree9541f5b475f8458723ac5a2b4ffce47814135355
parent6656c2ec4cc2163cd0a51d617f429ad7fb46d2d5 (diff)
patch 8.1.2206: no test for fixed issue #3893v8.1.2206
Problem: No test for fixed issue #3893. Solution: Add a test. (Christian Brabandt, #3893)
-rw-r--r--src/testdir/dumps/Test_winline_rnu.dump5
-rw-r--r--src/testdir/test_display.vim23
-rw-r--r--src/version.c2
3 files changed, 30 insertions, 0 deletions
diff --git a/src/testdir/dumps/Test_winline_rnu.dump b/src/testdir/dumps/Test_winline_rnu.dump
new file mode 100644
index 0000000000..31d579ec51
--- /dev/null
+++ b/src/testdir/dumps/Test_winline_rnu.dump
@@ -0,0 +1,5 @@
+|1+8#5fafaf255#303030255| @2> +0#0000000#ffffff0@45
+| +0#af5f00255&@1|1| |a+0#0000000&@45
+| +0#af5f00255&@3|a+0#0000000&@45
+| +0#af5f00255&@3|a+0#0000000&@17| @27
+@32|1|,|0|-|1| @8|A|l@1|
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index f500dc7891..a25d2cfe08 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -158,3 +158,26 @@ func Test_display_listchars_precedes()
set list& listchars& wrap&
bw!
endfunc
+
+" Check that win_lines() works correctly with the number_only parameter=TRUE
+" should break early to optimize cost of drawing, but needs to make sure
+" that the number column is correctly highlighted.
+func Test_scroll_CursorLineNr_update()
+ CheckScreendump
+
+ let lines =<< trim END
+ hi CursorLineNr ctermfg=73 ctermbg=236
+ set nu rnu cursorline cursorlineopt=number
+ exe ":norm! o\<esc>110ia\<esc>"
+ END
+ let filename = 'Xdrawscreen'
+ call writefile(lines, filename)
+ let buf = RunVimInTerminal('-S '.filename, #{rows: 5, cols: 50})
+ call term_sendkeys(buf, "k")
+ call term_wait(buf)
+ call VerifyScreenDump(buf, 'Test_winline_rnu', {})
+
+ " clean up
+ call StopVimInTerminal(buf)
+ call delete(filename)
+endfunc
diff --git a/src/version.c b/src/version.c
index 057ab74a84..e6a66be3cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2206,
+/**/
2205,
/**/
2204,