patch 9.0.0643: smoothscroll test fails

Problem:    Smoothscroll test fails.
Solution:   Check if skipcol changed.
diff --git a/src/normal.c b/src/normal.c
index 0539738..773c667 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2470,6 +2470,7 @@
 scroll_redraw(int up, long count)
 {
     linenr_T	prev_topline = curwin->w_topline;
+    int		prev_skipcol = curwin->w_skipcol;
 #ifdef FEAT_DIFF
     int		prev_topfill = curwin->w_topfill;
 #endif
@@ -2491,6 +2492,7 @@
 	// we get stuck at one position.  Don't move the cursor up if the
 	// first line of the buffer is already on the screen
 	while (curwin->w_topline == prev_topline
+		&& curwin->w_skipcol == prev_skipcol
 #ifdef FEAT_DIFF
 		&& curwin->w_topfill == prev_topfill
 #endif
diff --git a/src/version.c b/src/version.c
index 786a866..a228d74 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    643,
+/**/
     642,
 /**/
     641,