From b4aea3d1c8db13970f4c2743d20c2df989db6ac0 Mon Sep 17 00:00:00 2001
From: "Andy K. Massimino" <f8a663@normed.space>
Date: Mon, 29 Mar 2021 19:39:28 -0400
Subject: [PATCH 1/2] vim-patch:8.2.2612: col('.') may get outdated column
 value

Problem:    col('.') may get outdated column value.
Solution:   Add a note to the help how to make this work and add a test for
            it. (closes vim/vim#7971)
https://github.com/vim/vim/commit/18b7d86d7fa997bbb02a069dafacb32a0f73ca1e
---
 runtime/doc/map.txt               | 14 ++++++++++++++
 src/nvim/testdir/test_mapping.vim | 24 ++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index edec4a8de7..3ee26b0817 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -224,6 +224,20 @@ text before the cursor and start omni completion when some condition is met.
 For abbreviations |v:char| is set to the character that was typed to trigger
 the abbreviation.  You can use this to decide how to expand the {lhs}.  You
 should not either insert or change the v:char.
+ 
+Also, keep in mind that the expression may be evaluated when looking for
+typeahead, before the previous command has been executed.  For example: >
+	func StoreColumn()
+	  let g:column = col('.')
+	  return 'x'
+	endfunc
+	nnoremap <expr> x StoreColumn()
+	nmap ! f!x
+You will notice that g:column has the value from before executing "fx",
+because "z" is evaluated before "fx" is executed.
+This can be solved by inserting <Ignore> before the character that is
+expression-mapped: >
+	nmap ! f!<Ignore>x
 
 Be very careful about side effects!  The expression is evaluated while
 obtaining characters, you may very well make the command dysfunctional.
diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim
index c4807797ff..48b207e392 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/src/nvim/testdir/test_mapping.vim
@@ -427,6 +427,30 @@ func Test_error_in_map_expr()
   exe buf .. 'bwipe!'
 endfunc
 
+func Test_expr_map_gets_cursor()
+  new
+  call setline(1, ['one', 'some w!rd'])
+  func StoreColumn()
+    let g:exprLine = line('.')
+    let g:exprCol = col('.')
+    return 'x'
+  endfunc
+  nnoremap <expr> x StoreColumn()
+  2
+  nmap ! f!<Ignore>x
+  call feedkeys("!", 'xt')
+  call assert_equal('some wrd', getline(2))
+  call assert_equal(2, g:exprLine)
+  call assert_equal(7, g:exprCol)
+
+  bwipe!
+  unlet g:exprLine
+  unlet g:exprCol
+  delfunc ExprMapped
+  nunmap x
+  nunmap !
+endfunc
+
 " Test for mapping errors
 func Test_map_error()
   call assert_fails('unmap', 'E474:')

From 756f55959986eaa0de07a46e30512d7031766252 Mon Sep 17 00:00:00 2001
From: "Andy K. Massimino" <f8a663@normed.space>
Date: Mon, 29 Mar 2021 19:46:21 -0400
Subject: [PATCH 2/2] vim-patch:8.2.2613: new test throws exception

Problem:    New test throws exception.
Solution:   Adjust the function cleanup.
https://github.com/vim/vim/commit/6ccfd99b923cc3452a6e6450dfdd7e31ea602dfd
---
 src/nvim/testdir/test_mapping.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim
index 48b207e392..0191dbf33e 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/src/nvim/testdir/test_mapping.vim
@@ -446,7 +446,7 @@ func Test_expr_map_gets_cursor()
   bwipe!
   unlet g:exprLine
   unlet g:exprCol
-  delfunc ExprMapped
+  delfunc StoreColumn
   nunmap x
   nunmap !
 endfunc