patch 9.0.1258: code style test fails

Problem:    Code style test fails.
Solution:   Adjust test files.

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index cd68bfd01fd51c99e4cb1461e49d79d71130c6b3..7e1a0fca868b701d0b44ff5d29bd800010f17e37 100644 (file)
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3681,23 +3681,23 @@ func Test_popupmenu_info_too_wide()
 
       let menuText = 'some long text to make sure the menu takes up all of the width of the window'
       return #{
-       \ words: [
-         \ #{
-           \ word: 'scrap',
-           \ menu: menuText,
-           \ info: "other words are\ncooler than this and some more text\nto make wrap",
-         \ },
-         \ #{
-           \ word: 'scappier',
-           \ menu: menuText,
-           \ info: 'words are cool',
-         \ },
-         \ #{
-           \ word: 'scrappier2',
-           \ menu: menuText,
-           \ info: 'words are cool',
-         \ },
-       \ ]
+       \ words: [
+         \ #{
+           \ word: 'scrap',
+           \ menu: menuText,
+           \ info: "other words are\ncooler than this and some more text\nto make wrap",
+         \ },
+         \ #{
+           \ word: 'scappier',
+           \ menu: menuText,
+           \ info: 'words are cool',
+         \ },
+         \ #{
+           \ word: 'scrappier2',
+           \ menu: menuText,
+           \ info: 'words are cool',
+         \ },
+       \ ]
      \ }
     endfunc
   END

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index c489ae55d8928b5b015c68903794d6ad1c13d5f6..3d5148ecc1bd7f7cbaf15e713fc020b182e924a6 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -542,12 +542,12 @@ def Test_try_catch_throw()
   if 1
   else
     try | catch /pat/ | endtry
-    try | catch /pat/ 
+    try | catch /pat/
     endtry
-    try 
+    try
     catch /pat/ | endtry
-    try 
-    catch /pat/ 
+    try
+    catch /pat/
     endtry
   endif
 
@@ -617,7 +617,7 @@ def Test_try_catch_throw()
   endtry
   assert_equal(266, n)
 
-  l = [1, 2, 3] 
+  l = [1, 2, 3]
   try
     [n] = l
   catch /E1093:/
@@ -1336,7 +1336,7 @@ def Test_statusline_syntax()
       endfunc
       set laststatus=2 statusline=%!Status()
       redrawstatus
-      set laststatus statusline= 
+      set laststatus statusline=
   END
   v9.CheckScriptSuccess(lines)
 enddef
@@ -3601,7 +3601,7 @@ def Test_declare_script_var_in_func()
   END
   v9.CheckScriptFailure(lines, 'E1269:')
 enddef
-        
+
 def Test_lock_script_var()
   var lines =<< trim END
       vim9script
@@ -3626,7 +3626,7 @@ def Test_lock_script_var()
   END
   v9.CheckScriptSuccess(lines)
 enddef
-        
+
 
 func Test_vim9script_not_global()
   " check that items defined in Vim9 script are script-local, not global

diff --git a/src/version.c b/src/version.c
index 828ccaecec87064a9a465d53522e65a8b12e59d9..0cc20ca3bfa6d1c3036b59eec652f5f7674582d1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1258,
 /**/
     1257,
 /**/