Merge pull request #1530 from ychin/vim-tests-dont-use-guioptions-k

ci: Don't use guioptions-k in Vim tests, clean up defaults for gui tests

Author: ychin

.github/workflows/ci-macvim.yaml

@@ -380,6 +380,7 @@ jobs:
       - name: Test Vim (GUI)
         timeout-minutes: 25
         run: |
+          defaults delete org.vim.MacVim  # Clean up stale states left from MacVim tests
           make ${MAKE_BUILD_ARGS} -C src/testdir clean
           make ${MAKE_BUILD_ARGS} -C src testgui
 

src/testdir/runtest.vim

@@ -58,6 +58,9 @@ if has('gui_running')
   if has('gui_gtk')
     " to keep screendump size unchanged
     set guifont=Monospace\ 10
+  elseif has('gui_macvim')
+    " keep defaults consistent with other GUIs
+    set guioptions-=k
   endif
   set columns=80 lines=25
 endif