# HG changeset patch # User Bram Moolenaar # Date 1594576803 -7200 # Node ID 3fd32bf5fff055eed039505b8febca688bf8d55f # Parent a3e94fc0cba593e3ca4521919d9d5ea4ce7f78de patch 8.2.1194: test failure because shell prompt differs Commit: https://github.com/vim/vim/commit/a4dc6f92bb29b00783f8945bbe1101e837b6ad3c Author: Bram Moolenaar Date: Sun Jul 12 19:52:36 2020 +0200 patch 8.2.1194: test failure because shell prompt differs Problem: Test failure because shell prompt differs. Solution: Set the shell prompt. diff --git a/src/testdir/dumps/Test_popupwin_term_01.dump b/src/testdir/dumps/Test_popupwin_term_01.dump --- 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 --- 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 --- 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 --- 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,