patch 9.0.1610: display is wrong when 'smoothscroll' is setv9.0.1610

Problem:    Display is wrong when 'smoothscroll' is set and scrolling multiple
            lines.
Solution:   Redraw with UPD_NOT_VALID when "skipcol" is or was set.
            (closes #12490, closes #12468)

3 files changed, 14 insertions, 4 deletions

diff --git a/src/testdir/dumps/Test_smooth_multi_skipcol_1.dump b/src/testdir/dumps/Test_smooth_multi_skipcol_1.dump
index 80f563b715..f642e9263a 100644
--- a/src/testdir/dumps/Test_smooth_multi_skipcol_1.dump
+++ b/src/testdir/dumps/Test_smooth_multi_skipcol_1.dump
@@ -2,8 +2,8 @@
 | +0&&@39
 |a@39
 @10| @29
-@40
-@40
+|a@39
+@10| @29
 @40
 @40
 |b@2| @36
diff --git a/src/testdir/dumps/Test_smooth_multi_skipcol_2.dump b/src/testdir/dumps/Test_smooth_multi_skipcol_2.dump
index 9ef4aaf789..7431351c78 100644
--- a/src/testdir/dumps/Test_smooth_multi_skipcol_2.dump
+++ b/src/testdir/dumps/Test_smooth_multi_skipcol_2.dump
@@ -1,6 +1,6 @@
 |<+0#4040ff13#ffffff0@2|a+8#0000000&@5>a| @29
-| +0&&@39
-@40
+|a+0&&@39
+@10| @29
 @40
 @40
 |b@2| @36
diff --git a/src/testdir/dumps/Test_smooth_multi_skipcol_3.dump b/src/testdir/dumps/Test_smooth_multi_skipcol_3.dump
new file mode 100644
index 0000000000..a79f3fe633
--- /dev/null
+++ b/src/testdir/dumps/Test_smooth_multi_skipcol_3.dump
@@ -0,0 +1,10 @@
+|<+0#4040ff13#ffffff0@2|a+8#0000000&@5>a| @29
+| +0&&@39
+@40
+|b@2| @36
+|c@2| @36
+|~+0#4040ff13&| @38
+|~| @38
+|~| @38
+|~| @38
+| +0#0000000&@21|4|,|5|0| @9|B|o|t|