From 63488e8859b011a9faa55878d02b2580bbfc6ce3 Mon Sep 17 00:00:00 2001
From: ichizok <gclient.gaap@gmail.com>
Date: Wed, 10 Jun 2020 10:52:44 +0900
Subject: [PATCH] Workaround for #1050

* Revert [MMBackend update]
* Skip RunVim in Test_opt_default_cdpath
---
 src/MacVim/MMBackend.m       | 1 -
 src/testdir/test_options.vim | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
index 48793ab32a..fb1f2e901e 100644
--- a/src/MacVim/MMBackend.m
+++ b/src/MacVim/MMBackend.m
@@ -633,7 +633,6 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
     while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true)
             == kCFRunLoopRunHandledSource)
         ;   // do nothing
-    [self processInputQueue];
 }
 
 - (void)flushQueue:(BOOL UNUSED)force
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index d18b15fa15..855d1d5495 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -850,10 +850,13 @@ func Test_opt_default_cdpath()
   else
     let $CDPATH='/path/to/dir1;/path/to/dir2'
   endif
+  " Workaround for https://github.com/macvim-dev/macvim/issues/1050
+  if !(has('gui_macvim') && has('gui_running'))
   if RunVim([], after, '')
     call assert_equal([], readfile('Xtestout'))
     call delete('Xtestout')
   endif
+  endif
 endfunc
 
 " Test for setting keycodes using set