summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_gui.vim10
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index a372c1f9e2..5a1763db8d 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -694,12 +694,22 @@ func Test_scrollbars()
call setline(11, repeat('x', 150))
redraw
call assert_equal(1, wincol())
+ set number
+ redraw
+ call assert_equal(5, wincol())
+ set nonumber
+ redraw
call assert_equal(1, col('.'))
" scroll to character 11, cursor is moved
call test_scrollbar('hor', 10, 0)
redraw
call assert_equal(1, wincol())
+ set number
+ redraw
+ call assert_equal(5, wincol())
+ set nonumber
+ redraw
call assert_equal(11, col('.'))
set guioptions&
diff --git a/src/version.c b/src/version.c
index 2fd64c3f41..2687eb9431 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1482,
+/**/
1481,
/**/
1480,