summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-03 23:30:21 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-03 23:30:21 +0200
commit7cc535175a233c6f02cdb5a364b3590560f5bfcb (patch)
tree03f3a938f936f89656d33df85f2282d8652c4a37
parent6cd57d44669c02af9195f5601b882edd435b47e8 (diff)
patch 8.1.1806: test for display updating doesn't check without statuslinev8.1.1806
Problem: Test for display updating doesn't check without statusline. Solution: Add screenshots without a status line.
-rw-r--r--src/testdir/dumps/Test_scroll_no_region_4.dump10
-rw-r--r--src/testdir/dumps/Test_scroll_no_region_5.dump10
-rw-r--r--src/testdir/dumps/Test_scroll_no_region_6.dump10
-rw-r--r--src/testdir/test_display.vim11
-rw-r--r--src/version.c2
5 files changed, 43 insertions, 0 deletions
diff --git a/src/testdir/dumps/Test_scroll_no_region_4.dump b/src/testdir/dumps/Test_scroll_no_region_4.dump
new file mode 100644
index 0000000000..835a9910e7
--- /dev/null
+++ b/src/testdir/dumps/Test_scroll_no_region_4.dump
@@ -0,0 +1,10 @@
+|1+0&#ffffff0| @73
+|2| @73
+>3| @73
+|4| @73
+|5| @73
+|6| @73
+|7| @73
+|8| @73
+|9| @73
+|:|s|e|t| |l|a|s|t|s|t|a|t|u|s|=|0| @39|3|,|1| @10|T|o|p|
diff --git a/src/testdir/dumps/Test_scroll_no_region_5.dump b/src/testdir/dumps/Test_scroll_no_region_5.dump
new file mode 100644
index 0000000000..98152c7198
--- /dev/null
+++ b/src/testdir/dumps/Test_scroll_no_region_5.dump
@@ -0,0 +1,10 @@
+|1+0&#ffffff0| @73
+|2| @73
+>4| @73
+|5| @73
+|6| @73
+|7| @73
+|8| @73
+|9| @73
+|1|0| @72
+@57|3|,|1| @10|T|o|p|
diff --git a/src/testdir/dumps/Test_scroll_no_region_6.dump b/src/testdir/dumps/Test_scroll_no_region_6.dump
new file mode 100644
index 0000000000..03946082a6
--- /dev/null
+++ b/src/testdir/dumps/Test_scroll_no_region_6.dump
@@ -0,0 +1,10 @@
+|1+0&#ffffff0| @73
+|2| @73
+|4| @73
+|5| @73
+>3| @73
+|6| @73
+|7| @73
+|8| @73
+|9| @73
+@57|5|,|1| @10|T|o|p|
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index dfa641bbdf..6856759ecc 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -88,6 +88,17 @@ func Test_scroll_without_region()
call term_sendkeys(buf, ":4put\<cr>")
call VerifyScreenDump(buf, 'Test_scroll_no_region_3', {})
+ call term_sendkeys(buf, ":undo\<cr>")
+ call term_sendkeys(buf, ":undo\<cr>")
+ call term_sendkeys(buf, ":set laststatus=0\<cr>")
+ call VerifyScreenDump(buf, 'Test_scroll_no_region_4', {})
+
+ call term_sendkeys(buf, ":3delete\<cr>")
+ call VerifyScreenDump(buf, 'Test_scroll_no_region_5', {})
+
+ call term_sendkeys(buf, ":4put\<cr>")
+ call VerifyScreenDump(buf, 'Test_scroll_no_region_6', {})
+
" clean up
call StopVimInTerminal(buf)
call delete('Xtestscroll')
diff --git a/src/version.c b/src/version.c
index e2ebd89d16..daf5e8ba59 100644
--- a/src/version.c
+++ b/src/version.c
@@ -774,6 +774,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1806,
+/**/
1805,
/**/
1804,