patch 9.0.1561: display wrong when moving cursor to above the top line

Problem:    Display wrong when moving cursor to above the top line and
            'smoothscroll' is set.
Solution:   Call adjust_skipcol() in more places and make it work better.
            (Luuk van Baal, closes #12395)
diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim
index 636e7b7..469cf12 100644
--- a/src/testdir/test_scroll_opt.vim
+++ b/src/testdir/test_scroll_opt.vim
@@ -502,7 +502,7 @@
   " regardless of number and cpo-=n.
   setl number list listchars=precedes:< cpo-=n
   call s:check_col_calc(5, 1, 1)
-  exe "normal 2|\<C-E>"
+  exe "normal 3|\<C-E>h"
   call s:check_col_calc(6, 1, 18)
   norm h
   call s:check_col_calc(5, 2, 17)