Permalink
Browse files

patch 8.0.0539: startup test fails on Mac

Problem:    Startup test fails on Mac.
Solution:   Use another term name, "unknown" is known. Avoid a 2 second delay.
  • Loading branch information...
brammool committed Apr 2, 2017
1 parent 85045a7 commit 08f88b139d2f93661ed2b17214ee6b308b4edb5b
Showing with 15 additions and 2 deletions.
  1. +9 −0 src/main.c
  2. +1 −0 src/proto/main.pro
  3. +2 −1 src/term.c
  4. +1 −1 src/testdir/test_startup.vim
  5. +2 −0 src/version.c
View
@@ -1012,6 +1012,15 @@ common_init(mparm_T *paramp)
#endif
}
/*
* Return TRUE when the --not-a-term argument was found.
*/
int
is_not_a_term()
{
return params.not_a_term;
}
/*
* Main loop: Execute Normal mode commands until exiting Vim.
* Also used to handle commands in the command-line window, until the window
View
@@ -1,6 +1,7 @@
/* main.c */
int vim_main2(void);
void common_init(mparm_T *paramp);
int is_not_a_term(void);
void main_loop(int cmdwin, int noexmode);
void getout_preserve_modified(int exitval);
void getout(int exitval);
View
@@ -1705,7 +1705,8 @@ set_termname(char_u *term)
{
screen_start(); /* don't know where cursor is now */
out_flush();
ui_delay(2000L, TRUE);
if (!is_not_a_term())
ui_delay(2000L, TRUE);
}
set_string_option_direct((char_u *)"term", -1, term,
OPT_FREE, 0);
@@ -216,7 +216,7 @@ func Test_default_term()
endif
let save_term = $TERM
let $TERM = 'unknown'
let $TERM = 'unknownxxx'
let out = system(GetVimCommand() . ' -c''set term'' -c cq')
call assert_match("defaulting to 'ansi'", out)
let $TERM = save_term
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
539,
/**/
538,
/**/

0 comments on commit 08f88b1

Please sign in to comment.