patch 8.2.1315: MS-Windows: test log contains escape sequences

Problem:    MS-Windows: test log contains escape sequences.
Solution:   Do not use t_md and t_me but ANSI escape sequences. (Ken Takata,
            closes #6559)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index e42b0cabdbc362c6d39f91fea750729be663c6c3..f3609f8514582f38fff1858f42752d83175c14b7 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -123,6 +123,12 @@ let s:srcdir = expand('%:p:h:h')
 if has('win32')
   " avoid prompt that is long or contains a line break
   let $PROMPT = '$P$G'
+  " On MS-Windows t_md and t_me are Vim specific escape sequences.
+  let s:t_bold = "\x1b[1m"
+  let s:t_normal = "\x1b[m"
+else
+  let s:t_bold = &t_md
+  let s:t_normal = &t_me
 endif
 
 " Prepare for calling test_garbagecollect_now().
@@ -239,11 +245,11 @@ func RunTheTest(test)
     let message ..= repeat(' ', 50 - len(message))
     let time = reltime(func_start)
     if has('float') && reltimefloat(time) > 0.1
-      let message = &t_md .. message
+      let message = s:t_bold .. message
     endif
     let message ..= ' in ' .. reltimestr(time) .. ' seconds'
     if has('float') && reltimefloat(time) > 0.1
-      let message ..= &t_me
+      let message ..= s:t_normal
     endif
   endif
   call add(s:messages, message)
@@ -312,9 +318,9 @@ func FinishTesting()
     let message = 'Executed ' . s:done . (s:done > 1 ? ' tests' : ' test')
   endif
   if s:done > 0 && has('reltime')
-    let message = &t_md .. message .. repeat(' ', 40 - len(message))
+    let message = s:t_bold .. message .. repeat(' ', 40 - len(message))
     let message ..= ' in ' .. reltimestr(reltime(s:start_time)) .. ' seconds'
-    let message ..= &t_me
+    let message ..= s:t_normal
   endif
   echo message
   call add(s:messages, message)

diff --git a/src/version.c b/src/version.c
index b1ed1df4b612376d896a093ce7f1926ba843b22d..12716683573bfb23a337866aad9a23f83bf1eae5 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 */
+/**/
+    1315,
 /**/
     1314,
 /**/