From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 28 Jul 2017 11:51:30 +0000 (+0200)
Subject: patch 8.0.0788: MS-Windows: cannot build with terminal feature
X-Git-Tag: v8.0.0788
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f86eea9f01460e3b375ee768d4b863beb690006f;p=vim

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)
---

diff --git a/src/terminal.c b/src/terminal.c
index 4e87b51a1..f197718b0 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1094,6 +1094,26 @@ term_get_status_text(term_T *term)
     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
 
 #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 /* FEAT_TERMINAL */
diff --git a/src/version.c b/src/version.c
index 92c1eb432..7d0666989 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    788,
 /**/
     787,
 /**/