thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0788: MS-Windows: cannot build with terminal feature

Browse Source 
Problem:    MS-Windows: cannot build with terminal feature.
Solution:   Move set_ref_in_term(). (Ozaki Kiichi)
This commit is contained in:
Bram Moolenaar
2017-07-28 13:51:30 +02:00
parent 1f28b4c6a3
commit f86eea9f01
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/terminal.c
View File

@@ -1094,6 +1094,26 @@ term_get_status_text(term_T *term)
return term->tl_status_text; return term->tl_status_text;
} }
/*
* Mark references in jobs of terminals.
*/
int
set_ref_in_term(int copyID)
{
int abort = FALSE;
term_T *term;
typval_T tv;
for (term = first_term; term != NULL; term = term->tl_next)
if (term->tl_job != NULL)
{
tv.v_type = VAR_JOB;
tv.vval.v_job = term->tl_job;
abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL);
}
return abort;
}
# ifdef WIN3264 # ifdef WIN3264
#define WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN 1ul #define WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN 1ul
@@ -1399,26 +1419,6 @@ term_report_winsize(term_T *term, int rows, int cols)
} }
} }
/*
* Mark references in jobs of terminals.
*/
int
set_ref_in_term(int copyID)
{
int abort = FALSE;
term_T *term;
typval_T tv;
for (term = first_term; term != NULL; term = term->tl_next)
if (term->tl_job != NULL)
{
tv.v_type = VAR_JOB;
tv.vval.v_job = term->tl_job;
abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL);
}
return abort;
}
# endif # endif
#endif /* FEAT_TERMINAL */ #endif /* FEAT_TERMINAL */

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
788,
/**/ /**/
787, 787,
/**/ /**/