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

1 files changed, 20 insertions, 3 deletions

diff --git a/test/old/testdir/setup.vim b/test/old/testdir/setup.vim
index 7313a0a162..e7b4bb1a88 100644
--- a/test/old/testdir/setup.vim
+++ b/test/old/testdir/setup.vim
@@ -1,7 +1,7 @@
 if exists('s:did_load')
   " Align Nvim defaults to Vim.
   set backspace=
-  set commentstring=/*%s*/
+  set commentstring=/*\ %s\ */
   set complete=.,w,b,u,t,i
   set define=^\\s*#\\s*define
   set directory^=.
@@ -13,6 +13,7 @@ if exists('s:did_load')
   set laststatus=1
   set listchars=eol:$
   set joinspaces
+  set jumpoptions=
   set mousemodel=extend
   set nohidden nosmarttab noautoindent noautoread noruler noshowcmd
   set nohlsearch noincsearch
@@ -31,8 +32,8 @@ if exists('s:did_load')
   endif
   if g:testname !~ 'test_mapping.vim$'
     " Make "Q" switch to Ex mode.
-    " This does not work for all tests.
-    nnoremap Q gQ
+    " This does not work for all tests as Nvim only supports Vim Ex mode.
+    nnoremap Q gQ<Cmd>call<SID>ExStart()<CR>
   endif
 endif
 
@@ -44,12 +45,28 @@ if exists('s:did_load')
 endif
 let s:did_load = 1
 
+func s:ExStart()
+  call feedkeys($"\<Cmd>call{expand('<SID>')}ExMayEnd()\<CR>")
+endfunc
+
+func s:ExMayEnd()
+  " When :normal runs out of characters in Vim, the behavior is different in
+  " normal Ex mode vs. Vim Ex mode.
+  " - In normal Ex mode, "\n" is used.
+  " - In Vim Ex mode, Ctrl-C is used.
+  " Nvim only supports Vim Ex mode, so emulate the normal Ex mode behavior.
+  if state('m') == '' && mode(1) == 'cv' && getcharstr(1) == "\<C-C>"
+    call feedkeys("\n")
+  endif
+endfunc
+
 " Clear Nvim default user commands, mappings and menus.
 comclear
 mapclear
 mapclear!
 aunmenu *
 tlunmenu *
+autocmd! nvim_popupmenu
 
 " Undo the 'grepprg' and 'grepformat' setting in _defaults.lua.
 set grepprg& grepformat&