From: Christian Brabandt <cb@256bit.org>
Date: Wed, 27 Mar 2024 09:44:14 +0000 (+0100)
Subject: patch 9.1.0212: CI: MS-Windows fails in test_winfixbuf
X-Git-Tag: v9.1.0212^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79b2867ce3f4ed99d8c4e06c2c3b8f105f67c53a;p=thirdparty%2Fvim.git

patch 9.1.0212: CI: MS-Windows fails in test_winfixbuf

Problem:  CI: MS-Windows fails in test_winfixbuf
          (after v9.1.208)
Solution: Skip Ms-Windows for now, fix style

related: #14286

Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim
index ba44b42cca..462554b112 100644
--- a/src/testdir/test_winfixbuf.vim
+++ b/src/testdir/test_winfixbuf.vim
@@ -1239,30 +1239,34 @@ endfunc
 func Test_edit_same_buffer_in_memory()
   call s:reset_all_buffers()
 
-  let l:current = bufnr()
+  let current = bufnr()
   file same_buffer
 
-  call assert_equal(l:current, bufnr())
+  call assert_equal(current, bufnr())
   set winfixbuf
   edit same_buffer
-  call assert_equal(l:current, bufnr())
+  call assert_equal(current, bufnr())
+  set nowinfixbuf
 endfunc
 
 " Allow :e selecting the current buffer as a full path
 func Test_edit_same_buffer_on_disk_absolute_path()
+  " This fails on CI (Windows builds), why?
+  CheckNotMSWindows
   call s:reset_all_buffers()
 
-  let l:file = tempname()
-  let l:current = bufnr()
-  execute "edit " . l:file
+  let file = tempname()
+  let current = bufnr()
+  execute "edit " . file
   write!
 
-  call assert_equal(l:current, bufnr())
+  call assert_equal(current, bufnr())
   set winfixbuf
-  execute "edit " l:file
-  call assert_equal(l:current, bufnr())
+  execute "edit " file
+  call assert_equal(current, bufnr())
 
-  call delete(l:file)
+  call delete(file)
+  set nowinfixbuf
 endfunc
 
 " Fail :enew but :enew! is allowed
diff --git a/src/version.c b/src/version.c
index 6341259724..1ea07b334b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    212,
 /**/
     211,
 /**/