From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Jan 2019 19:51:04 +0000 (+0100)
Subject: patch 8.1.0708: third argument for redrawWinline() is always FALSE
X-Git-Tag: v8.1.0708
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae12f4bad306a1a3a2d54ff6ed76df9b11d19469;p=vim

patch 8.1.0708: third argument for redrawWinline() is always FALSE

Problem:    Third argument for redrawWinline() is always FALSE.
Solution:   Drop the argument. (neovim #9479)
---

diff --git a/src/edit.c b/src/edit.c
index 813e95d34..bd840d147 100644
--- 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);
     }
 }
 
diff --git a/src/move.c b/src/move.c
index a94a1ab9d..119941ff4 100644
--- 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
diff --git a/src/proto/screen.pro b/src/proto/screen.pro
index 552453ad8..665b772d9 100644
--- a/src/proto/screen.pro
+++ b/src/proto/screen.pro
@@ -8,7 +8,7 @@ void redraw_buf_later(buf_T *buf, int type);
 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);
diff --git a/src/screen.c b/src/screen.c
index 04f19d7ac..880d78407 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -492,28 +492,13 @@ redraw_after_callback(int call_update_screen)
     void
 redrawWinline(
     win_T	*wp,
-    linenr_T	lnum,
-    int		invalid UNUSED)	/* window line height is invalid now */
+    linenr_T	lnum)
 {
-#ifdef FEAT_FOLDING
-    int		i;
-#endif
-
     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
diff --git a/src/version.c b/src/version.c
index e9a5a43b7..3375b1c20 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    708,
 /**/
     707,
 /**/