To: vim_dev@googlegroups.com Subject: Patch 8.0.1603 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1603 Problem: Cannot build with +terminal but without +menu. Solution: Add #ifdef. (Damien) Files: src/terminal.c *** ../vim-8.0.1602/src/terminal.c 2018-03-11 19:30:40.128142740 +0100 --- src/terminal.c 2018-03-13 13:06:11.249902651 +0100 *************** *** 2738,2745 **** else pos.col = 0; ! screen_line(wp->w_winrow + pos.row + winbar_height(wp), ! wp->w_wincol, pos.col, wp->w_width, FALSE); } term->tl_dirty_row_start = MAX_ROW; term->tl_dirty_row_end = 0; --- 2738,2748 ---- else pos.col = 0; ! 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; *** ../vim-8.0.1602/src/version.c 2018-03-13 13:10:37.140284761 +0100 --- src/version.c 2018-03-13 13:13:44.587144140 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1603, /**/ -- A)bort, R)etry, D)o it right this time /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///