Skip to content

Commit f86eea9

Browse files
committed
patch 8.0.0788: MS-Windows: cannot build with terminal feature
Problem: MS-Windows: cannot build with terminal feature. Solution: Move set_ref_in_term(). (Ozaki Kiichi)
1 parent 1f28b4c commit f86eea9

2 files changed

Lines changed: 22 additions & 20 deletions

File tree

src/terminal.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,26 @@ term_get_status_text(term_T *term)
10941094
return term->tl_status_text;
10951095
}
10961096

1097+
/*
1098+
* Mark references in jobs of terminals.
1099+
*/
1100+
int
1101+
set_ref_in_term(int copyID)
1102+
{
1103+
int abort = FALSE;
1104+
term_T *term;
1105+
typval_T tv;
1106+
1107+
for (term = first_term; term != NULL; term = term->tl_next)
1108+
if (term->tl_job != NULL)
1109+
{
1110+
tv.v_type = VAR_JOB;
1111+
tv.vval.v_job = term->tl_job;
1112+
abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL);
1113+
}
1114+
return abort;
1115+
}
1116+
10971117
# ifdef WIN3264
10981118

10991119
#define WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN 1ul
@@ -1399,26 +1419,6 @@ term_report_winsize(term_T *term, int rows, int cols)
13991419
}
14001420
}
14011421

1402-
/*
1403-
* Mark references in jobs of terminals.
1404-
*/
1405-
int
1406-
set_ref_in_term(int copyID)
1407-
{
1408-
int abort = FALSE;
1409-
term_T *term;
1410-
typval_T tv;
1411-
1412-
for (term = first_term; term != NULL; term = term->tl_next)
1413-
if (term->tl_job != NULL)
1414-
{
1415-
tv.v_type = VAR_JOB;
1416-
tv.vval.v_job = term->tl_job;
1417-
abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL);
1418-
}
1419-
return abort;
1420-
}
1421-
14221422
# endif
14231423

14241424
#endif /* FEAT_TERMINAL */

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
788,
772774
/**/
773775
787,
774776
/**/

0 commit comments

Comments
 (0)