summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-14 17:05:18 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-14 17:05:18 +0100
commitc2adc00fa74530e7f9d2cd31ce39252e86465dd0 (patch)
treed7a97b05e5c8a0f4f6d5768265da69f7b3692a15
parent4132eb505c506f7a0710b03a275d1c5a247e4196 (diff)
downloadvim-git-c2adc00fa74530e7f9d2cd31ce39252e86465dd0.tar.gz
patch 8.2.0259: terminal in popup test sometimes failsv8.2.0259
Problem: Terminal in popup test sometimes fails. Solution: Clear the command line.
-rw-r--r--src/testdir/dumps/Test_terminal_popup_1.dump2
-rw-r--r--src/testdir/test_terminal.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/dumps/Test_terminal_popup_1.dump b/src/testdir/dumps/Test_terminal_popup_1.dump
index 8c2a54d84..a03d58981 100644
--- a/src/testdir/dumps/Test_terminal_popup_1.dump
+++ b/src/testdir/dumps/Test_terminal_popup_1.dump
@@ -8,7 +8,7 @@
|7| @12|║+0#0000001#ffd7ff255|~+0#4040ff13#ffffff0| @43|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@13
|8| @12|║+0#0000001#ffd7ff255|~+0#4040ff13#ffffff0| @43|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@13
|9| @12|║+0#0000001#ffd7ff255|~+0#4040ff13#ffffff0| @43|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@13
-|1|0| @11|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@26|1|,|1| @10|A|l@1| |║+0#0000001#ffd7ff255| +0#0000000#ffffff0@13
+|1|0| @11|║+0#0000001#ffd7ff255|:+0#0000000#ffffff0| @25|1|,|1| @10|A|l@1| |║+0#0000001#ffd7ff255| +0#0000000#ffffff0@13
|1@1| @11|╚+0#0000001#ffd7ff255|═@44|⇲| +0#0000000#ffffff0@13
|1|2| @72
|1|3| @72
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 993498cdd..5259454c8 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2353,6 +2353,7 @@ func Test_terminal_in_popup()
\ ]
call writefile(lines, 'XtermPopup')
let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
+ call term_sendkeys(buf, ":\<CR>")
call VerifyScreenDump(buf, 'Test_terminal_popup_1', {})
call term_sendkeys(buf, ":q\<CR>")
diff --git a/src/version.c b/src/version.c
index 2720dc652..7dacf84a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 259,
+/**/
258,
/**/
257,