diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-28 13:51:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-28 13:51:30 +0200 |
| commit | f86eea9f01460e3b375ee768d4b863beb690006f (patch) | |
| tree | a739ffa49e903a40299166b65b45ab6fe160d363 | |
| parent | 1f28b4c6a30d1519a8770d16cbb874735ccced97 (diff) | |
| download | vim-git-f86eea9f01460e3b375ee768d4b863beb690006f.tar.gz | |
patch 8.0.0788: MS-Windows: cannot build with terminal featurev8.0.0788
Problem: MS-Windows: cannot build with terminal feature.
Solution: Move set_ref_in_term(). (Ozaki Kiichi)
| -rw-r--r-- | src/terminal.c | 40 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 22 insertions, 20 deletions
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 @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 788, +/**/ 787, /**/ 786, |