Skip to content
Merged

Fix CI #1046

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/MacVim/MMBackend.m
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ - (void)update
while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true)
== kCFRunLoopRunHandledSource)
; // do nothing
[self processInputQueue];
}

- (void)flushQueue:(BOOL)force
Expand Down Expand Up @@ -729,8 +730,7 @@ - (BOOL)waitForInput:(int)milliseconds

// The above calls may have placed messages on the input queue so process
// it now. This call may enter a blocking loop.
if ([inputQueue count] > 0)
[self processInputQueue];
[self processInputQueue];

return inputReceived;
}
Expand Down
9 changes: 8 additions & 1 deletion src/MacVim/gui_macvim.m
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,19 @@

CFAbsoluteTime nowTime = CFAbsoluteTimeGetCurrent();
if (nowTime - lastTime > 1.0 / 30) {
[[MMBackend sharedInstance] update];
gui_macvim_update();
lastTime = nowTime;
}
}


void
gui_macvim_update(void)
{
[[MMBackend sharedInstance] update];
}


/* Flush any output to the screen */
void
gui_mch_flush(void)
Expand Down
2 changes: 2 additions & 0 deletions src/proto/gui_macvim.pro
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ gui_mch_open(void);
void
gui_mch_update(void);
void
gui_macvim_update(void);
void
gui_mch_flush(void);
void
gui_macvim_flush(void);
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/runtest.vim
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ for g:testfunc in sort(s:tests)
" tests pending for now before a more proper fix is implemented.
call extend(s:messages, [
\ 'Flaky test failed too often, giving up',
\ 'MacVim marked ' . s:test . ' as pending',
\ 'MacVim marked ' . g:testfunc . ' as pending',
\ ])
let v:errors = []
endif
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/test_netbeans.vim
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ func Nb_basic(port)

" detach
call appendbufline(cmdbufnr, '$', 'detach_Test')
call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 6)')
call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 8)')
let l = readfile('Xnetbeans')
call assert_equal('0:disconnect=91', l[-1])

Expand Down
7 changes: 7 additions & 0 deletions src/ui.c
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,14 @@ ui_breakcheck_force(int force)

#ifdef FEAT_GUI
if (gui.in_use)
{
# ifdef FEAT_GUI_MACVIM
if (force)
gui_macvim_update();
else
# endif
gui_mch_update();
}
else
#endif
mch_breakcheck(force);
Expand Down