From 6963c2bdcd3cc2a2f0466b23152e80fc0d037a2c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 1 Aug 2022 14:04:55 +0800
Subject: vim-patch:8.2.0815: maparg() does not provide enough information for
 mapset()

Problem:    maparg() does not provide enough information for mapset().
Solution:   Add "lhsraw" and "lhsrawalt" items.  Drop "simplified"
https://github.com/vim/vim/commit/9c65253fe702ea010afec11aa971acd542c35de2

vim-patch:9.0.0127: unused variable

Problem:    Unused variable.
Solution:   Remove the variable. (closes vim/vim#10829)
https://github.com/vim/vim/commit/e95f22f63a1871b91e5508088e5ae4905ce28cd7
---
 test/functional/vimscript/map_functions_spec.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/functional/vimscript/map_functions_spec.lua')

diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index 275c72d212..15d4d41ac1 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -13,6 +13,7 @@ describe('maparg()', function()
 
   local foo_bar_map_table = {
       lhs='foo',
+      lhsraw='foo',
       script=0,
       silent=0,
       rhs='bar',
@@ -141,6 +142,7 @@ describe('maparg()', function()
     local function acmap(lhs, rhs)
       return {
         lhs = ac(lhs),
+        lhsraw = ac(lhs),
         rhs = ac(rhs),
 
         buffer = 0,
-- 
cgit 


From d954e8da62faccd468896baf2fe06107196cf952 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 1 Aug 2022 16:46:58 +0800
Subject: feat(mapset): support restoring "replace_keycodes" and "desc"

---
 test/functional/vimscript/map_functions_spec.lua | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'test/functional/vimscript/map_functions_spec.lua')

diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
index 15d4d41ac1..aa64006de0 100644
--- a/test/functional/vimscript/map_functions_spec.lua
+++ b/test/functional/vimscript/map_functions_spec.lua
@@ -3,7 +3,10 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
+local expect = helpers.expect
+local feed = helpers.feed
 local funcs = helpers.funcs
+local meths = helpers.meths
 local nvim = helpers.nvim
 local source = helpers.source
 local command = helpers.command
@@ -163,3 +166,32 @@ describe('maparg()', function()
     eq(acmap('e`', 'f`'), funcs.maparg(ac('e`'), 'n', 0, 1))
   end)
 end)
+
+describe('mapset()', function()
+  before_each(clear)
+
+  it('can restore mapping description from the dict returned by maparg()', function()
+    meths.set_keymap('n', 'lhs', 'rhs', {desc = 'map description'})
+    eq('\nn  lhs           rhs\n                 map description',
+       helpers.exec_capture("nmap lhs"))
+    local mapargs = funcs.maparg('lhs', 'n', false, true)
+    meths.del_keymap('n', 'lhs')
+    eq('\nNo mapping found', helpers.exec_capture("nmap lhs"))
+    funcs.mapset('n', false, mapargs)
+    eq('\nn  lhs           rhs\n                 map description',
+       helpers.exec_capture("nmap lhs"))
+  end)
+
+  it('can restore "replace_keycodes" from the dict returned by maparg()', function()
+    meths.set_keymap('i', 'foo', [['<l' .. 't>']], {expr = true, replace_keycodes = true})
+    feed('Afoo')
+    expect('<')
+    local mapargs = funcs.maparg('foo', 'i', false, true)
+    meths.set_keymap('i', 'foo', [['<l' .. 't>']], {expr = true})
+    feed('foo')
+    expect('<<lt>')
+    funcs.mapset('i', false, mapargs)
+    feed('foo')
+    expect('<<lt><')
+  end)
+end)
-- 
cgit