From a4dc6f92bb29b00783f8945bbe1101e837b6ad3c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar <Bram@vim.org> Date: Sun, 12 Jul 2020 19:52:36 +0200 Subject: [PATCH] patch 8.2.1194: test failure because shell prompt differs Problem: Test failure because shell prompt differs. Solution: Set the shell prompt. --- src/testdir/dumps/Test_popupwin_term_01.dump | 2 +- src/testdir/dumps/Test_popupwin_term_02.dump | 2 +- src/testdir/test_popupwin.vim | 1 + 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 edc0b001b4..473c991c86 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 d5636c9838..afa330f326 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 140f6825b0..45f55f55b2 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 96f29fa378..68c6db4d5c 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1194, /**/ 1193, /**/ -- GitLab