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)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 60805f1318fb7e09bf1bdcf1a686545f225494c0..3cf2a506c975e470305101a7222f3e836ebf1c87 100644 (file)
--- 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 3847ec9b4ac99b93b126a9fb0c31110584163dac..e4e70243b63e131b095752bb231f71e5381d250c 100644 (file)
--- 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,
 /**/