updated for version 7.3.810
Problem: 'relativenumber is reset unexpectedly. (François Ingelrest)
Solution: After an option was reset also reset the global value. Add a test.
(Christian Brabandt)
diff --git a/src/option.c b/src/option.c
index f38e9c7..adb501b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7109,7 +7109,7 @@
return errmsg;
}
-#ifdef FEAT_SYN_HL
+#if defined(FEAT_SYN_HL) || defined(PROTO)
/*
* Simple int comparison function for use with qsort()
*/
@@ -7630,17 +7630,22 @@
}
#endif
- /* 'list', 'number' */
- else if ((int *)varp == &curwin->w_p_list
- || (int *)varp == &curwin->w_p_nu
+ /* 'number', 'relativenumber' */
+ else if ((int *)varp == &curwin->w_p_nu
|| (int *)varp == &curwin->w_p_rnu)
{
/* If 'number' is set, reset 'relativenumber'. */
/* If 'relativenumber' is set, reset 'number'. */
if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
+ {
curwin->w_p_rnu = FALSE;
+ curwin->w_allbuf_opt.wo_rnu = FALSE;
+ }
if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu)
+ {
curwin->w_p_nu = FALSE;
+ curwin->w_allbuf_opt.wo_nu = FALSE;
+ }
}
else if ((int *)varp == &curbuf->b_p_ro)
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 701c304..c1a8bd6 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -31,7 +31,8 @@
test66.out test67.out test68.out test69.out test70.out \
test71.out test72.out test73.out test74.out test75.out \
test76.out test77.out test78.out test79.out test80.out \
- test81.out test82.out test83.out test84.out test88.out
+ test81.out test82.out test83.out test84.out test88.out \
+ test89.out
.SUFFIXES: .in .out
@@ -136,3 +137,4 @@
test83.out: test83.in
test84.out: test84.in
test88.out: test88.in
+test89.out: test89.in
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index e902be3..fb52e80 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -30,7 +30,8 @@
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
- test84.out test85.out test86.out test87.out test88.out
+ test84.out test85.out test86.out test87.out test88.out \
+ test89.out
SCRIPTS32 = test50.out test70.out
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index c7bbb54..8aab596 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -50,7 +50,8 @@
test68.out test69.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
- test84.out test85.out test86.out test87.out test88.out
+ test84.out test85.out test86.out test87.out test88.out \
+ test89.out
SCRIPTS32 = test50.out test70.out
diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index d930926..d052855 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -31,7 +31,8 @@
test66.out test67.out test68.out test69.out test70.out \
test71.out test72.out test73.out test74.out test75.out \
test76.out test77.out test78.out test79.out test80.out \
- test81.out test82.out test83.out test84.out test88.out
+ test81.out test82.out test83.out test84.out test88.out \
+ test89.out
.SUFFIXES: .in .out
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 5398031..df5b660 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -76,7 +76,7 @@
test66.out test67.out test68.out test69.out \
test71.out test72.out test74.out test75.out test76.out \
test77.out test78.out test79.out test80.out test81.out \
- test82.out test83.out test84.out test88.out
+ test82.out test83.out test84.out test88.out test89.out
# Known problems:
# Test 30: a problem around mac format - unknown reason
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index d29b4f5..6ca89dc 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -27,7 +27,8 @@
test69.out test70.out test71.out test72.out test73.out \
test74.out test75.out test76.out test77.out test78.out \
test79.out test80.out test81.out test82.out test83.out \
- test84.out test85.out test86.out test87.out test88.out
+ test84.out test85.out test86.out test87.out test88.out \
+ test89.out
SCRIPTS_GUI = test16.out
diff --git a/src/version.c b/src/version.c
index b2ea5c0..453d817 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 810,
+/**/
809,
/**/
808,