From 936c11f9c871f3c8a6e26473b9f70e53dfb94bc3 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 5 Jul 2022 13:54:03 +0800
Subject: test(old): use Q -> gQ mapping instead of changing test when possible

---
 src/nvim/testdir/setup.vim           | 4 ++++
 src/nvim/testdir/test_substitute.vim | 2 +-
 src/nvim/testdir/test_timers.vim     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim
index f1092af358..dfcde37f62 100644
--- a/src/nvim/testdir/setup.vim
+++ b/src/nvim/testdir/setup.vim
@@ -30,6 +30,10 @@ set switchbuf=
 mapclear
 mapclear!
 
+" Make "Q" switch to Ex mode.
+" This does not work for all tests.
+nnoremap Q gQ
+
 " Prevent Nvim log from writing to stderr.
 let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'
 
diff --git a/src/nvim/testdir/test_substitute.vim b/src/nvim/testdir/test_substitute.vim
index 8483435062..bd44079882 100644
--- a/src/nvim/testdir/test_substitute.vim
+++ b/src/nvim/testdir/test_substitute.vim
@@ -140,7 +140,7 @@ func Test_substitute_repeat()
   " This caused an invalid memory access.
   split Xfile
   s/^/x
-  call feedkeys("gQsc\<CR>y", 'tx')
+  call feedkeys("Qsc\<CR>y", 'tx')
   bwipe!
 endfunc
 
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 09eed4e10d..5c67efb831 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -279,7 +279,7 @@ func Test_ex_mode()
   endfunc
   let timer = timer_start(40, function('g:Foo'), {'repeat':-1})
   " This used to throw error E749.
-  exe "normal gQsleep 100m\rvi\r"
+  exe "normal Qsleep 100m\rvi\r"
   call timer_stop(timer)
 endfunc
 
-- 
cgit