updated for version 7.3.861v7.3.861

Problem:    ":setlocal number" clears global value of 'relativenumber'.
Solution:   Do it properly. (Markus Heidelberg)

2 files changed, 52 insertions, 0 deletions

diff --git a/src/testdir/test89.in b/src/testdir/test89.in
index 7b25b20c15..122165d4f0 100644
--- a/src/testdir/test89.in
+++ b/src/testdir/test89.in
@@ -10,6 +10,43 @@ STARTTEST
 :$put ='results:'
 :$put a
 :$put b
+:"
+:set nonu nornu
+:setglobal nu
+:setlocal rnu
+:redir @c | setglobal nu? | redir END
+:set nonu nornu
+:setglobal rnu
+:setlocal nu
+:redir @d | setglobal rnu? | redir END
+:$put =':setlocal must NOT reset the other global value'
+:$put c
+:$put d
+:"
+:set nonu nornu
+:setglobal nu
+:setglobal rnu
+:redir @e | setglobal nu? | redir END
+:set nonu nornu
+:setglobal rnu
+:setglobal nu
+:redir @f | setglobal rnu? | redir END
+:$put =':setglobal MUST reset the other global value'
+:$put e
+:$put f
+:"
+:set nonu nornu
+:set nu
+:set rnu
+:redir @g | setglobal nu? | redir END
+:set nonu nornu
+:set rnu
+:set nu
+:redir @h | setglobal rnu? | redir END
+:$put =':set MUST reset the other global value'
+:$put g
+:$put h
+:"
 :/^results/,$w! test.out
 :q!
 ENDTEST
diff --git a/src/testdir/test89.ok b/src/testdir/test89.ok
index 0f45471dc9..93824bb947 100644
--- a/src/testdir/test89.ok
+++ b/src/testdir/test89.ok
@@ -5,3 +5,18 @@ nonumber
 
 nonumber
   relativenumber
+:setlocal must NOT reset the other global value
+
+  number
+
+  relativenumber
+:setglobal MUST reset the other global value
+
+nonumber
+
+norelativenumber
+:set MUST reset the other global value
+
+nonumber
+
+norelativenumber