diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-07-12 19:52:36 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-07-12 19:52:36 +0200 |
commit | a4dc6f92bb29b00783f8945bbe1101e837b6ad3c (patch) | |
tree | 682687001f3db453d793dfdcf687046c52d84da0 /src | |
parent | 35910f2d54bd670a0d83b3474b4c23faa94252d3 (diff) | |
download | vim-git-a4dc6f92bb29b00783f8945bbe1101e837b6ad3c.tar.gz |
patch 8.2.1194: test failure because shell prompt differsv8.2.1194
Problem: Test failure because shell prompt differs.
Solution: Set the shell prompt.
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/dumps/Test_popupwin_term_01.dump | 2 | ||||
-rw-r--r-- | src/testdir/dumps/Test_popupwin_term_02.dump | 2 | ||||
-rw-r--r-- | src/testdir/test_popupwin.vim | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/dumps/Test_popupwin_term_01.dump b/src/testdir/dumps/Test_popupwin_term_01.dump index edc0b001b..473c991c8 100644 --- a/src/testdir/dumps/Test_popupwin_term_01.dump +++ b/src/testdir/dumps/Test_popupwin_term_01.dump @@ -1,4 +1,4 @@ -|$+0&#ffffff0| @73 +|v+0&#ffffff0|i|m|>| @70 @75 @34|╔+0#0000001#ffd7ff255|═@3|╗| +0#0000000#ffffff0@34 @34|║+0#0000001#ffd7ff255|1@3|║| +0#0000000#ffffff0@34 diff --git a/src/testdir/dumps/Test_popupwin_term_02.dump b/src/testdir/dumps/Test_popupwin_term_02.dump index d5636c983..afa330f32 100644 --- a/src/testdir/dumps/Test_popupwin_term_02.dump +++ b/src/testdir/dumps/Test_popupwin_term_02.dump @@ -1,4 +1,4 @@ -|$+0&#ffffff0| @73 +|v+0&#ffffff0|i|m|>| @70 @75 @14|╔+0#0000001#ffd7ff255|═@3|╗| +0#0000000#ffffff0@54 @14|║+0#0000001#ffd7ff255|1@3|║| +0#0000000#ffffff0@54 diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 140f6825b..45f55f55b 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -585,6 +585,7 @@ func Test_popup_drag_termwin() " create a popup that covers the terminal window let lines =<< trim END set shell=/bin/sh noruler + let $PS1 = 'vim> ' terminal $wincmd w let winid = popup_create(['1111', '2222'], #{ diff --git a/src/version.c b/src/version.c index 96f29fa37..68c6db4d5 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1194, +/**/ 1193, /**/ 1192, |