changeset 14571:44df6e5c17c3 v8.1.0299

patch 8.1.0299: misplaced comment commit https://github.com/vim/vim/commit/142ae736d984f4575c1c6ec1a4f679ae4ddf9413 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 19 17:04:01 2018 +0200 patch 8.1.0299: misplaced comment Problem: misplaced comment Solution: Remove comment
author Christian Brabandt <cb@256bit.org>
date Sun, 19 Aug 2018 17:15:05 +0200
parents 6b938ed7d3b4
children 7bf554378133
files src/testdir/runtest.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -272,7 +272,7 @@ let s:flaky = [
       \ 'Test_paused()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()',
-      \ 'Test_popup_and_window_resize()',  " sometimes fails on Mac
+      \ 'Test_popup_and_window_resize()',
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
       \ 'Test_reltime()',
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    299,
+/**/
     298,
 /**/
     297,