From 2690b5aed8b6b6070430b05dcae296cd9479c942 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 22 Jul 2020 18:14:58 +0200 Subject: patch 8.2.1267: MS-Windows: tests may fail due to $PROMPT value Problem: MS-Windows: tests may fail due to $PROMPT value. Solution: Set $PROMPT for testing. (Taro Muraoka, closes #6510) --- src/testdir/runtest.vim | 5 +++++ src/version.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 60805f131..3cf2a506c 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -117,6 +117,11 @@ set shellslash let s:srcdir = expand('%:p:h:h') +if has('win32') + " avoid prompt that is long or contains a line break + let $PROMPT = '$P$G' +endif + " Prepare for calling test_garbagecollect_now(). let v:testing = 1 diff --git a/src/version.c b/src/version.c index 3847ec9b4..e4e70243b 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 */ +/**/ + 1267, /**/ 1266, /**/ -- cgit v1.2.1