To: vim_dev@googlegroups.com Subject: Patch 8.0.1520 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1520 Problem: Cursor is in the wrong line when using a WinBar in a Terminal window. Solution: Adjust the row number. (Christian Brabandt, closes #2362) Files: src/screen.c, src/terminal.c *** ../vim-8.0.1519/src/screen.c 2018-02-10 18:45:21.088822014 +0100 --- src/screen.c 2018-02-13 21:09:23.367668624 +0100 *************** *** 1176,1181 **** --- 1176,1186 ---- */ if (term_update_window(wp) == OK) { + # ifdef FEAT_MENU + /* Draw the window toolbar, if there is one. */ + if (winbar_height(wp) > 0) + redraw_win_toolbar(wp); + # endif wp->w_redr_type = 0; return; } *** ../vim-8.0.1519/src/terminal.c 2018-02-13 14:07:14.716305872 +0100 --- src/terminal.c 2018-02-13 21:14:44.193127974 +0100 *************** *** 2398,2405 **** else pos.col = 0; ! screen_line(wp->w_winrow + pos.row, wp->w_wincol, ! pos.col, wp->w_width, FALSE); } term->tl_dirty_row_start = MAX_ROW; term->tl_dirty_row_end = 0; --- 2398,2405 ---- 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; *** ../vim-8.0.1519/src/version.c 2018-02-13 19:21:12.870210334 +0100 --- src/version.c 2018-02-13 21:18:00.755359483 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1520, /**/ -- FATHER: You only killed the bride's father - that's all - LAUNCELOT: Oh dear, I didn't really mean to... FATHER: Didn't mean to? You put your sword right through his head! LAUNCELOT: Gosh - Is he all right? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///