From a9186501f6070a655f96207881a54bf509bd79ce Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Wed, 25 Nov 2020 01:26:52 -0500
Subject: vim-patch:8.1.2390: test94 is old style, fix 7.4.441 not tested

Problem:    Test94 is old style, fix 7.4.441 not tested.
Solution:   Turn test94 into a new style test.  Add tests for the fix in patch
            7.4.441. (Yegappan Lakshmanan, closes vim/vim#5316)
https://github.com/vim/vim/commit/309976ec1f033c68480bbc8cc363db5b5ea944f9
---
 src/nvim/testdir/test_cmdline.vim | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src/nvim/testdir/test_cmdline.vim')

diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index e3c42a4fe3..400e53d009 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -796,6 +796,27 @@ func Test_cmdwin_feedkeys()
   call feedkeys("q:\<CR>", 'x')
 endfunc
 
+" Tests for the issues fixed in 7.4.441.
+" When 'cedit' is set to Ctrl-C, opening the command window hangs Vim
+func Test_cmdwin_cedit()
+  exe "set cedit=\<C-c>"
+  normal! :
+  call assert_equal(1, winnr('$'))
+
+  let g:cmd_wintype = ''
+  func CmdWinType()
+      let g:cmd_wintype = getcmdwintype()
+      return ''
+  endfunc
+
+  call feedkeys("\<C-c>a\<C-R>=CmdWinType()\<CR>\<CR>")
+  echo input('')
+  call assert_equal('@', g:cmd_wintype)
+
+  set cedit&vim
+  delfunc CmdWinType
+endfunc
+
 func Test_buffers_lastused()
   " check that buffers are sorted by time when wildmode has lastused
   edit bufc " oldest
-- 
cgit 


From ede747c2cc84382e8746df8992ef0e403647ffde Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Wed, 25 Nov 2020 01:32:48 -0500
Subject: vim-patch:8.2.0257: cannot recognize a terminal in a popup window

Problem:    Cannot recognize a terminal in a popup window.
Solution:   Add the win_gettype() function.
https://github.com/vim/vim/commit/00f3b4e007af07870168bf044cecc9d544483953
---
 src/nvim/testdir/test_cmdline.vim | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/nvim/testdir/test_cmdline.vim')

diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index 400e53d009..81f653c393 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -806,12 +806,14 @@ func Test_cmdwin_cedit()
   let g:cmd_wintype = ''
   func CmdWinType()
       let g:cmd_wintype = getcmdwintype()
+      let g:wintype = win_gettype()
       return ''
   endfunc
 
   call feedkeys("\<C-c>a\<C-R>=CmdWinType()\<CR>\<CR>")
   echo input('')
   call assert_equal('@', g:cmd_wintype)
+  call assert_equal('command', g:wintype)
 
   set cedit&vim
   delfunc CmdWinType
-- 
cgit