summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/option.c2
-rw-r--r--src/testdir/test_expr.vim23
-rw-r--r--src/version.c2
3 files changed, 26 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 47bbe733b..95f4c734a 100644
--- a/src/option.c
+++ b/src/option.c
@@ -9102,7 +9102,7 @@ get_option_value(
if ((int *)varp == &curbuf->b_changed)
*numval = curbufIsChanged();
else
- *numval = (long) *(varnumber_T *)varp;
+ *numval = (long) *(int *)varp;
}
return 1;
}
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index f44e21660..067dbf24f 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -106,3 +106,26 @@ func Test_special_char()
" The failure is only visible using valgrind.
call assert_fails('echo "\<C-">')
endfunc
+
+func Test_option_value()
+ " boolean
+ set bri
+ call assert_equal(1, &bri)
+ set nobri
+ call assert_equal(0, &bri)
+
+ " number
+ set ts=1
+ call assert_equal(1, &ts)
+ set ts=8
+ call assert_equal(8, &ts)
+
+ " string
+ exe "set cedit=\<Esc>"
+ call assert_equal("\<Esc>", &cedit)
+ set cpo=
+ call assert_equal("", &cpo)
+ set cpo=abcdefgi
+ call assert_equal("abcdefgi", &cpo)
+ set cpo&vim
+endfunc
diff --git a/src/version.c b/src/version.c
index 1613a7222..1e9672bdb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1979,
+/**/
1978,
/**/
1977,