Merge branch 'master' of github.com:macvim-dev/macvim

Author: splhack

src/testdir/test_terminal.vim

@@ -802,6 +802,11 @@ func Test_terminal_aucmd_on_close()
 endfunc
 
 func Test_terminal_term_start_empty_command()
+  " Workaround: ignore "No Menu" error
+  if has('gui_macvim') && has('gui_running')
+    call test_ignore_error('E329')
+  endif
+
   let cmd = "call term_start('', {'curwin' : 1, 'term_finish' : 'close'})"
   call assert_fails(cmd, 'E474')
   let cmd = "call term_start('', {'curwin' : 1, 'term_finish' : 'close'})"