Merge remote-tracking branch 'upstream/master' into rahm

1 files changed, 5 insertions, 21 deletions

diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index f4c2b507a9..7265beb56b 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -31,22 +31,19 @@ local keymap = {}
 ---    vim.keymap.set('n', 'asdf', function() return require('jkl').my_fun() end)
 --- </pre>
 ---
----@param mode string|table   Same mode short names as |nvim_set_keymap()|.
+---@param mode string|table    Same mode short names as |nvim_set_keymap()|.
 ---                            Can also be list of modes to create mapping on multiple modes.
----@param lhs string          Left-hand side |{lhs}| of the mapping.
+---@param lhs string           Left-hand side |{lhs}| of the mapping.
 ---@param rhs string|function  Right-hand side |{rhs}| of the mapping. Can also be a Lua function.
----                            If a Lua function and `opts.expr == true`, returning `nil` is
----                            equivalent to an empty string.
 --
 ---@param opts table A table of |:map-arguments| such as "silent". In addition to the options
 ---                  listed in |nvim_set_keymap()|, this table also accepts the following keys:
 ---                  - buffer: (number or boolean) Add a mapping to the given buffer. When "true"
 ---                    or 0, use the current buffer.
----                  - replace_keycodes: (boolean, default true) When both this and expr is "true",
----                  |nvim_replace_termcodes()| is applied to the result of Lua expr maps.
 ---                  - remap: (boolean) Make the mapping recursive. This is the
 ---                  inverse of the "noremap" option from |nvim_set_keymap()|.
 ---                  Default `false`.
+---                  - replace_keycodes: (boolean) defaults to true if "expr" is true.
 ---@see |nvim_set_keymap()|
 function keymap.set(mode, lhs, rhs, opts)
   vim.validate({
@@ -60,22 +57,9 @@ function keymap.set(mode, lhs, rhs, opts)
   local is_rhs_luaref = type(rhs) == 'function'
   mode = type(mode) == 'string' and { mode } or mode
 
-  if is_rhs_luaref and opts.expr then
-    local user_rhs = rhs
-    rhs = function()
-      local res = user_rhs()
-      if res == nil then
-        -- TODO(lewis6991): Handle this in C?
-        return ''
-      elseif opts.replace_keycodes ~= false then
-        return vim.api.nvim_replace_termcodes(res, true, true, true)
-      else
-        return res
-      end
-    end
+  if opts.expr and opts.replace_keycodes ~= false then
+    opts.replace_keycodes = true
   end
-  -- clear replace_keycodes from opts table
-  opts.replace_keycodes = nil
 
   if opts.remap == nil then
     -- default remap value is false