diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-13 13:14:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-13 13:14:00 +0100 |
| commit | f118d4847eb0dc2473260aebce301643568c5bc3 (patch) | |
| tree | af7250b28df117175f203ee13650929347a9154d | |
| parent | 625f0c1eb75da08229843fa393b1ee4e6547d285 (diff) | |
| download | vim-git-f118d4847eb0dc2473260aebce301643568c5bc3.tar.gz | |
patch 8.0.1603: cannot build with +terminal but without +menuv8.0.1603
Problem: Cannot build with +terminal but without +menu.
Solution: Add #ifdef. (Damien)
| -rw-r--r-- | src/terminal.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c index 43a2a317e..1bef46060 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2738,8 +2738,11 @@ term_update_window(win_T *wp) else pos.col = 0; - screen_line(wp->w_winrow + pos.row + winbar_height(wp), - wp->w_wincol, pos.col, wp->w_width, FALSE); + screen_line(wp->w_winrow + pos.row +#ifdef FEAT_MENU + + winbar_height(wp) +#endif + , wp->w_wincol, pos.col, wp->w_width, FALSE); } term->tl_dirty_row_start = MAX_ROW; term->tl_dirty_row_end = 0; diff --git a/src/version.c b/src/version.c index 2a537e6b1..d1fd6ea5f 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1603, +/**/ 1602, /**/ 1601, |