neovim

commit 3c667d3e0fe41a900cee9477e190ae02d7ec0c23
parent 242261d4e77806cdb4559c2be58613113a393a4e
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sat, 23 Dec 2023 15:30:44 +0800

fix(mappings): fix mapset() not replacing map with backslash (#26719)


Diffstat:
M
src/nvim/mapping.c
 | 
2
+-
M
test/functional/vimscript/map_functions_spec.lua
 | 
10
++++++++++

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c
@@ -2350,7 +2350,7 @@ void f_mapset(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
 
   // Delete any existing mapping for this lhs and mode.
   MapArguments unmap_args = MAP_ARGUMENTS_INIT;
-  set_maparg_lhs_rhs(lhs, strlen(lhs), "", 0, LUA_NOREF, 0, &unmap_args);
+  set_maparg_lhs_rhs(lhs, strlen(lhs), "", 0, LUA_NOREF, CPO_TO_CPO_FLAGS, &unmap_args);
   unmap_args.buffer = buffer;
   buf_do_map(MAPTYPE_UNMAP, &unmap_args, mode, is_abbr, curbuf);
   xfree(unmap_args.rhs);
diff --git a/test/functional/vimscript/map_functions_spec.lua b/test/functional/vimscript/map_functions_spec.lua
@@ -180,6 +180,16 @@ end)
 describe('mapset()', function()
   before_each(clear)
 
+  it('can restore mapping with backslash in lhs', function()
+    meths.set_keymap('n', '\\ab', 'a', {})
+    eq('\nn  \\ab           a', exec_capture("nmap \\ab"))
+    local mapargs = funcs.maparg('\\ab', 'n', false, true)
+    meths.set_keymap('n', '\\ab', 'b', {})
+    eq('\nn  \\ab           b', exec_capture("nmap \\ab"))
+    funcs.mapset('n', false, mapargs)
+    eq('\nn  \\ab           a', exec_capture("nmap \\ab"))
+  end)
+
   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', exec_capture("nmap lhs"))