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 e42b0ca..f3609f8 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -123,6 +123,12 @@
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 @@
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 @@
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 b1ed1df..1271668 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1315,
+/**/
1314,
/**/
1313,