]> granicus.if.org Git - vim/commitdiff
patch 8.0.0788: MS-Windows: cannot build with terminal feature v8.0.0788
authorBram Moolenaar <Bram@vim.org>
Fri, 28 Jul 2017 11:51:30 +0000 (13:51 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 28 Jul 2017 11:51:30 +0000 (13:51 +0200)
Problem:    MS-Windows: cannot build with terminal feature.
Solution:   Move set_ref_in_term(). (Ozaki Kiichi)

src/terminal.c
src/version.c

index 4e87b51a1d3f6e71e5967e825fdbe84d283cace5..f197718b05d261aaa479dca135baca98531d129c 100644 (file)
@@ -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 */
index 92c1eb4322fd6147f6efa52d8117f8dd208b4c25..7d066698971a0db54310705084e8c403cc7f4782 100644 (file)
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    788,
 /**/
     787,
 /**/