Merge pull request #17932 from zeertzjq/vim-8.1.2145

vim-patch:8.1.{2145,2159,2165,2167,2333,2346,2350},8.2.{0839,0851,0855,0867,0916,0919,2084,2728,3595,4504,4819,4824,4827,4828,4829,4833,4837}

3 files changed, 65 insertions, 53 deletions

diff --git a/test/functional/editor/langmap_spec.lua b/test/functional/editor/langmap_spec.lua
index af19f97a68..b1070ecddc 100644
--- a/test/functional/editor/langmap_spec.lua
+++ b/test/functional/editor/langmap_spec.lua
@@ -213,11 +213,11 @@ describe("'langmap'", function()
     iii]])
   end)
 
-  local function testrecording(command_string, expect_string, setup_function)
+  local function testrecording(command_string, expect_string, setup_function, expect_macro)
     if setup_function then setup_function() end
     feed('qa' .. command_string .. 'q')
     expect(expect_string)
-    eq(helpers.funcs.nvim_replace_termcodes(command_string, true, true, true),
+    eq(expect_macro or helpers.funcs.nvim_replace_termcodes(command_string, true, true, true),
       eval('@a'))
     if setup_function then setup_function() end
     -- n.b. may need nvim_replace_termcodes() here.
@@ -273,8 +273,8 @@ describe("'langmap'", function()
   it('treats control modified keys as characters', function()
     command('nnoremap <C-w> iw<esc>')
     command('nnoremap <C-i> ii<esc>')
-    testrecording('<C-w>', 'whello', local_setup)
-    testrecording('<C-i>', 'ihello', local_setup)
+    testrecording('<C-w>', 'whello', local_setup, eval([["\<*C-w>"]]))
+    testrecording('<C-i>', 'ihello', local_setup, eval([["\<*C-i>"]]))
   end)
 
 end)
diff --git a/test/functional/editor/mode_cmdline_spec.lua b/test/functional/editor/mode_cmdline_spec.lua
index 0f7d821bb5..50cc5e17ee 100644
--- a/test/functional/editor/mode_cmdline_spec.lua
+++ b/test/functional/editor/mode_cmdline_spec.lua
@@ -3,67 +3,74 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, insert, funcs, eq, feed =
   helpers.clear, helpers.insert, helpers.funcs, helpers.eq, helpers.feed
+local eval = helpers.eval
 local meths = helpers.meths
 
-describe('cmdline CTRL-R', function()
+describe('cmdline', function()
   before_each(clear)
 
-  it('pasting non-special register inserts <CR> *between* lines', function()
-    insert([[
-    line1abc
-    line2somemoretext
-    ]])
-    -- Yank 2 lines linewise, then paste to cmdline.
-    feed([[<C-\><C-N>gg0yj:<C-R>0]])
-    -- <CR> inserted between lines, NOT after the final line.
-    eq('line1abc\rline2somemoretext', funcs.getcmdline())
+  describe('Ctrl-R', function()
+    it('pasting non-special register inserts <CR> *between* lines', function()
+      insert([[
+      line1abc
+      line2somemoretext
+      ]])
+      -- Yank 2 lines linewise, then paste to cmdline.
+      feed([[<C-\><C-N>gg0yj:<C-R>0]])
+      -- <CR> inserted between lines, NOT after the final line.
+      eq('line1abc\rline2somemoretext', funcs.getcmdline())
 
-    -- Yank 2 lines charwise, then paste to cmdline.
-    feed([[<C-\><C-N>gg05lyvj:<C-R>0]])
-    -- <CR> inserted between lines, NOT after the final line.
-    eq('abc\rline2', funcs.getcmdline())
+      -- Yank 2 lines charwise, then paste to cmdline.
+      feed([[<C-\><C-N>gg05lyvj:<C-R>0]])
+      -- <CR> inserted between lines, NOT after the final line.
+      eq('abc\rline2', funcs.getcmdline())
 
-    -- Yank 1 line linewise, then paste to cmdline.
-    feed([[<C-\><C-N>ggyy:<C-R>0]])
-    -- No <CR> inserted.
-    eq('line1abc', funcs.getcmdline())
-  end)
+      -- Yank 1 line linewise, then paste to cmdline.
+      feed([[<C-\><C-N>ggyy:<C-R>0]])
+      -- No <CR> inserted.
+      eq('line1abc', funcs.getcmdline())
+    end)
 
-  it('pasting special register inserts <CR>, <NL>', function()
-    feed([[:<C-R>="foo\nbar\rbaz"<CR>]])
-    eq('foo\nbar\rbaz', funcs.getcmdline())
+    it('pasting special register inserts <CR>, <NL>', function()
+      feed([[:<C-R>="foo\nbar\rbaz"<CR>]])
+      eq('foo\nbar\rbaz', funcs.getcmdline())
+    end)
   end)
-end)
 
-describe('cmdline history', function()
-  before_each(clear)
+  it('Ctrl-Shift-V supports entering unsimplified key notations', function()
+    feed(':"<C-S-V><C-J><C-S-V><C-@><C-S-V><C-[><C-S-V><C-S-M><C-S-V><M-C-I><C-S-V><C-D-J><CR>')
 
-  it('correctly clears start of the history', function()
-    -- Regression test: check absence of the memory leak when clearing start of
-    -- the history using ex_getln.c/clr_history().
-    eq(1, funcs.histadd(':', 'foo'))
-    eq(1, funcs.histdel(':'))
-    eq('', funcs.histget(':', -1))
+    eq('"<C-J><C-@><C-[><C-S-M><M-C-I><C-D-J>', eval('@:'))
   end)
 
-  it('correctly clears end of the history', function()
-    -- Regression test: check absence of the memory leak when clearing end of
-    -- the history using ex_getln.c/clr_history().
-    meths.set_option('history', 1)
-    eq(1, funcs.histadd(':', 'foo'))
-    eq(1, funcs.histdel(':'))
-    eq('', funcs.histget(':', -1))
-  end)
+  describe('history', function()
+    it('correctly clears start of the history', function()
+      -- Regression test: check absence of the memory leak when clearing start of
+      -- the history using ex_getln.c/clr_history().
+      eq(1, funcs.histadd(':', 'foo'))
+      eq(1, funcs.histdel(':'))
+      eq('', funcs.histget(':', -1))
+    end)
+
+    it('correctly clears end of the history', function()
+      -- Regression test: check absence of the memory leak when clearing end of
+      -- the history using ex_getln.c/clr_history().
+      meths.set_option('history', 1)
+      eq(1, funcs.histadd(':', 'foo'))
+      eq(1, funcs.histdel(':'))
+      eq('', funcs.histget(':', -1))
+    end)
 
-  it('correctly removes item from history', function()
-    -- Regression test: check that ex_getln.c/del_history_idx() correctly clears
-    -- history index after removing history entry. If it does not then deleting
-    -- history will result in a double free.
-    eq(1, funcs.histadd(':', 'foo'))
-    eq(1, funcs.histadd(':', 'bar'))
-    eq(1, funcs.histadd(':', 'baz'))
-    eq(1, funcs.histdel(':', -2))
-    eq(1, funcs.histdel(':'))
-    eq('', funcs.histget(':', -1))
+    it('correctly removes item from history', function()
+      -- Regression test: check that ex_getln.c/del_history_idx() correctly clears
+      -- history index after removing history entry. If it does not then deleting
+      -- history will result in a double free.
+      eq(1, funcs.histadd(':', 'foo'))
+      eq(1, funcs.histadd(':', 'bar'))
+      eq(1, funcs.histadd(':', 'baz'))
+      eq(1, funcs.histdel(':', -2))
+      eq(1, funcs.histdel(':'))
+      eq('', funcs.histget(':', -1))
+    end)
   end)
 end)
diff --git a/test/functional/editor/mode_insert_spec.lua b/test/functional/editor/mode_insert_spec.lua
index c38acbe96a..684dee69db 100644
--- a/test/functional/editor/mode_insert_spec.lua
+++ b/test/functional/editor/mode_insert_spec.lua
@@ -131,6 +131,11 @@ describe('insert-mode', function()
     end)
   end)
 
+  it('Ctrl-Shift-V supports entering unsimplified key notations', function()
+    feed('i<C-S-V><C-J><C-S-V><C-@><C-S-V><C-[><C-S-V><C-S-M><C-S-V><M-C-I><C-S-V><C-D-J><Esc>')
+    expect('<C-J><C-@><C-[><C-S-M><M-C-I><C-D-J>')
+  end)
+
   describe([[With 'insertmode', Insert mode is not re-entered immediately after <C-L>]], function()
     before_each(function()
       command('set insertmode')