From 8ba9f19961d8573dc851d3d5f2ec217ad2fb7b28 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 6 Feb 2022 04:46:16 +0800
Subject: vim-patch:8.2.1727: a popup created with "cursorline" will ignore
 "firstline"

Problem:    A popup created with "cursorline" will ignore "firstline".
Solution:   When both "cursorline" and "firstline" are present put the cursor
            on "firstline". (closes vim/vim#7000)  Add the "winid" argument to
            getcurpos().
https://github.com/vim/vim/commit/99ca9c4868bb1669706b9e3de9a9218bd11cc459

Skip popup window related code.
Cherry-pick all of Test_getcurpos_setpos() from patch 8.2.0610.
---
 src/nvim/eval.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/eval.lua')

diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index ef2b8a0cc0..8590614a0a 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -151,7 +151,7 @@ return {
     getcmdtype={},
     getcmdwintype={},
     getcompletion={args={2, 3}, base=1},
-    getcurpos={},
+    getcurpos={args={0, 1}, base=1},
     getcwd={args={0, 2}, base=1},
     getenv={args=1, base=1},
     getfontname={args={0, 1}},
-- 
cgit 


From 6ab71683d14a408e79f7cbda3a07ab65f76c6b35 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 6 Feb 2022 04:46:16 +0800
Subject: vim-patch:8.2.2324: not easy to get mark en cursor posotion by
 character count

Problem:    Not easy to get mark en cursor posotion by character count.
Solution:   Add functions that use character index. (Yegappan Lakshmanan,
            closes vim/vim#7648)
https://github.com/vim/vim/commit/6f02b00bb0958f70bc15534e115b4c6dadff0e06
---
 src/nvim/eval.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/nvim/eval.lua')

diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 8590614a0a..5c85d764fb 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -71,6 +71,7 @@ return {
     chanclose={args={1, 2}},
     chansend={args=2},
     char2nr={args={1, 2}, base=1},
+    charcol={args=1, base=1},
     charidx={args={2, 3}, base=1},
     chdir={args=1, base=1},
     cindent={args=1, base=1},
@@ -144,6 +145,7 @@ return {
     getchangelist={args={0, 1}, base=1},
     getchar={args={0, 1}},
     getcharmod={},
+    getcharpos={args=1, base=1},
     getcharsearch={},
     getcharstr={args={0, 1}},
     getcmdline={},
@@ -152,6 +154,7 @@ return {
     getcmdwintype={},
     getcompletion={args={2, 3}, base=1},
     getcurpos={args={0, 1}, base=1},
+    getcursorcharpos={args={0, 1}, base=1},
     getcwd={args={0, 2}, base=1},
     getenv={args=1, base=1},
     getfontname={args={0, 1}},
@@ -312,8 +315,10 @@ return {
     serverstop={args=1},
     setbufline={args=3, base=3},
     setbufvar={args=3, base=3},
+    setcharpos={args=2, base=2},
     setcharsearch={args=1, base=1},
     setcmdpos={args=1, base=1},
+    setcursorcharpos={args={1, 3}, base=1},
     setenv={args=2, base=2},
     setfperm={args=2, base=1},
     setline={args=2, base=2},
-- 
cgit