To: vim_dev@googlegroups.com Subject: Patch 8.2.1315 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1315 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) Files: src/testdir/runtest.vim *** ../vim-8.2.1314/src/testdir/runtest.vim 2020-07-27 20:02:21.008597321 +0200 --- src/testdir/runtest.vim 2020-07-29 15:02:14.574462056 +0200 *************** *** 123,128 **** --- 123,134 ---- 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,249 **** let message ..= repeat(' ', 50 - len(message)) let time = reltime(func_start) if has('float') && reltimefloat(time) > 0.1 ! let message = &t_md .. message endif let message ..= ' in ' .. reltimestr(time) .. ' seconds' if has('float') && reltimefloat(time) > 0.1 ! let message ..= &t_me endif endif call add(s:messages, message) --- 245,255 ---- let message ..= repeat(' ', 50 - len(message)) let time = reltime(func_start) if has('float') && reltimefloat(time) > 0.1 ! let message = s:t_bold .. message endif let message ..= ' in ' .. reltimestr(time) .. ' seconds' if has('float') && reltimefloat(time) > 0.1 ! let message ..= s:t_normal endif endif call add(s:messages, message) *************** *** 312,320 **** 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 ..= ' in ' .. reltimestr(reltime(s:start_time)) .. ' seconds' ! let message ..= &t_me endif echo message call add(s:messages, message) --- 318,326 ---- let message = 'Executed ' . s:done . (s:done > 1 ? ' tests' : ' test') endif if s:done > 0 && has('reltime') ! let message = s:t_bold .. message .. repeat(' ', 40 - len(message)) let message ..= ' in ' .. reltimestr(reltime(s:start_time)) .. ' seconds' ! let message ..= s:t_normal endif echo message call add(s:messages, message) *** ../vim-8.2.1314/src/version.c 2020-07-29 14:40:21.863245604 +0200 --- src/version.c 2020-07-29 14:59:48.379010221 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1315, /**/ -- From "know your smileys": <>:-) Bishop /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///