changeset 15400:ac5542aadd9c v8.1.0708

patch 8.1.0708: third argument for redrawWinline() is always FALSE commit https://github.com/vim/vim/commit/ae12f4bad306a1a3a2d54ff6ed76df9b11d19469 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 9 20:51:04 2019 +0100 patch 8.1.0708: third argument for redrawWinline() is always FALSE Problem: Third argument for redrawWinline() is always FALSE. Solution: Drop the argument. (neovim https://github.com/vim/vim/issues/9479)
author Bram Moolenaar <Bram@vim.org>
date Wed, 09 Jan 2019 21:00:07 +0100
parents a715450117cf
children c1c2910907d8
files src/edit.c src/move.c src/proto/screen.pro src/screen.c src/version.c
diffstat 5 files changed, 10 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/edit.c
+++ b/src/edit.c
@@ -1955,7 +1955,7 @@ edit_unputchar(void)
 	if (pc_status == PC_STATUS_RIGHT)
 	    ++curwin->w_wcol;
 	if (pc_status == PC_STATUS_RIGHT || pc_status == PC_STATUS_LEFT)
-	    redrawWinline(curwin, curwin->w_cursor.lnum, FALSE);
+	    redrawWinline(curwin, curwin->w_cursor.lnum);
 	else
 #endif
 	    screen_puts(pc_bytes, pc_row - msg_scrolled, pc_col, pc_attr);
@@ -2006,7 +2006,7 @@ undisplay_dollar(void)
     if (dollar_vcol >= 0)
     {
 	dollar_vcol = -1;
-	redrawWinline(curwin, curwin->w_cursor.lnum, FALSE);
+	redrawWinline(curwin, curwin->w_cursor.lnum);
     }
 }
 
@@ -7074,7 +7074,7 @@ check_spell_redraw(void)
 	linenr_T	lnum = spell_redraw_lnum;
 
 	spell_redraw_lnum = 0;
-	redrawWinline(curwin, lnum, FALSE);
+	redrawWinline(curwin, lnum);
     }
 }
 
--- a/src/move.c
+++ b/src/move.c
@@ -153,8 +153,8 @@ redraw_for_cursorline(win_T *wp)
 		// "w_last_cursorline" may be outdated, worst case we redraw
 		// too much.  This is optimized for moving the cursor around in
 		// the current window.
-		redrawWinline(wp, wp->w_last_cursorline, FALSE);
-		redrawWinline(wp, wp->w_cursor.lnum, FALSE);
+		redrawWinline(wp, wp->w_last_cursorline);
+		redrawWinline(wp, wp->w_cursor.lnum);
 		redraw_win_later(wp, VALID);
 	    }
 	    else
--- a/src/proto/screen.pro
+++ b/src/proto/screen.pro
@@ -8,7 +8,7 @@ void redraw_buf_later(buf_T *buf, int ty
 void redraw_buf_and_status_later(buf_T *buf, int type);
 int redraw_asap(int type);
 void redraw_after_callback(int call_update_screen);
-void redrawWinline(win_T *wp, linenr_T lnum, int invalid);
+void redrawWinline(win_T *wp, linenr_T lnum);
 void reset_updating_screen(int may_resize_shell);
 void update_curbuf(int type);
 int update_screen(int type_arg);
--- a/src/screen.c
+++ b/src/screen.c
@@ -492,28 +492,13 @@ redraw_after_callback(int call_update_sc
     void
 redrawWinline(
     win_T	*wp,
-    linenr_T	lnum,
-    int		invalid UNUSED)	/* window line height is invalid now */
-{
-#ifdef FEAT_FOLDING
-    int		i;
-#endif
-
+    linenr_T	lnum)
+{
     if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum)
 	wp->w_redraw_top = lnum;
     if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum)
 	wp->w_redraw_bot = lnum;
     redraw_win_later(wp, VALID);
-
-#ifdef FEAT_FOLDING
-    if (invalid)
-    {
-	/* A w_lines[] entry for this lnum has become invalid. */
-	i = find_wl_entry(wp, lnum);
-	if (i >= 0)
-	    wp->w_lines[i].wl_valid = FALSE;
-    }
-#endif
 }
 
     void
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    708,
+/**/
     707,
 /**/
     706,