From 8147d3df284a075f89746f9d5e948b5220c45f0b Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Tue, 8 Nov 2022 00:21:22 +0100
Subject: vim-patch:9.0.0844: handling 'statusline' errors is spread out
 (#20992)

Problem:    Handling 'statusline' errors is spread out.
Solution:   Pass the option name to the lower levels so the option can be
            reset there when an error is encountered. (Luuk van Baal,
            closes vim/vim#11467)

https://github.com/vim/vim/commit/7b224fdf4a29f115567d4fc8629c1cef92d8444a
---
 test/functional/lua/ffi_spec.lua | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'test/functional/lua/ffi_spec.lua')

diff --git a/test/functional/lua/ffi_spec.lua b/test/functional/lua/ffi_spec.lua
index 80c01a2b8c..3969a7a478 100644
--- a/test/functional/lua/ffi_spec.lua
+++ b/test/functional/lua/ffi_spec.lua
@@ -35,11 +35,12 @@ describe('ffi.cdef', function()
 
         int build_stl_str_hl(
           win_T *wp,
-          char_u *out,
+          char *out,
           size_t outlen,
-          char_u *fmt,
-          int use_sandbox,
-          char_u fillchar,
+          char *fmt,
+          char *opt_name,
+          int opt_scope,
+          int fillchar,
           int maxwidth,
           stl_hlrec_t **hltab,
           StlClickRecord **tabtab
@@ -48,9 +49,10 @@ describe('ffi.cdef', function()
 
       return ffi.C.build_stl_str_hl(
         ffi.C.find_window_by_handle(0, ffi.new('Error')),
-        ffi.new('char_u[1024]'),
+        ffi.new('char[1024]'),
         1024,
-        ffi.cast('char_u*', 'StatusLineOfLength20'),
+        ffi.cast('char*', 'StatusLineOfLength20'),
+        nil,
         0,
         0,
         0,
-- 
cgit 


From 364b131f42509326c912c9b0fef5dfc94ed23b41 Mon Sep 17 00:00:00 2001
From: luukvbaal <31730729+luukvbaal@users.noreply.github.com>
Date: Mon, 9 Jan 2023 18:12:06 +0100
Subject: feat(ui): add 'statuscolumn' option

Problem:    Unable to customize the column next to a window ('gutter').
Solution:   Add 'statuscolumn' option that follows the 'statusline' syntax,
	    allowing to customize the status column. Also supporting the %@
	    click execute function label. Adds new items @C and @s which
	    will print the fold and sign columns. Line numbers and signs
	    can be clicked, highlighted, aligned, transformed, margined etc.
---
 test/functional/lua/ffi_spec.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'test/functional/lua/ffi_spec.lua')

diff --git a/test/functional/lua/ffi_spec.lua b/test/functional/lua/ffi_spec.lua
index 3969a7a478..18b13a8959 100644
--- a/test/functional/lua/ffi_spec.lua
+++ b/test/functional/lua/ffi_spec.lua
@@ -29,6 +29,7 @@ describe('ffi.cdef', function()
         typedef struct window_S win_T;
         typedef struct {} stl_hlrec_t;
         typedef struct {} StlClickRecord;
+        typedef struct {} statuscol_T;
         typedef struct {} Error;
 
         win_T *find_window_by_handle(int Window, Error *err);
@@ -43,7 +44,8 @@ describe('ffi.cdef', function()
           int fillchar,
           int maxwidth,
           stl_hlrec_t **hltab,
-          StlClickRecord **tabtab
+          StlClickRecord **tabtab,
+          statuscol_T *scp
         );
       ]]
 
@@ -57,6 +59,7 @@ describe('ffi.cdef', function()
         0,
         0,
         nil,
+        nil,
         nil
       )
     ]=])
-- 
cgit