diff --git a/src/option.c b/src/option.c
index 47bbe73..95f4c73 100644
--- a/src/option.c
+++ b/src/option.c
@@ -9102,7 +9102,7 @@
 	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 f44e216..067dbf2 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -106,3 +106,26 @@
   " 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 1613a72..1e9672b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1979,
+/**/
     1978,
 /**/
     1977,