Mercurial > vim

changeset 21287:3fd32bf5fff0 v8.2.1194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1194: test failure because shell prompt differs Commit: https://github.com/vim/vim/commit/a4dc6f92bb29b00783f8945bbe1101e837b6ad3c Author: Bram Moolenaar <Bram@vim.org> 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 12 Jul 2020 20:00:03 +0200
parents a3e94fc0cba5
children 1b8a30833e59
files src/testdir/dumps/Test_popupwin_term_01.dump src/testdir/dumps/Test_popupwin_term_02.dump src/testdir/test_popupwin.vim src/version.c
diffstat 4 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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'], #{
--- 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,