Mercurial > vim
changeset 4219:6fe728bf165e v7.3.861
updated for version 7.3.861
Problem: ":setlocal number" clears global value of 'relativenumber'.
Solution: Do it properly. (Markus Heidelberg)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 13 Mar 2013 20:42:32 +0100 |
| parents | a3d776a5719b |
| children | 2e5e2e82a737 |
| files | src/option.c src/testdir/test89.in src/testdir/test89.ok src/version.c |
| diffstat | 4 files changed, 79 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -7631,22 +7631,33 @@ set_bool_option(opt_idx, varp, value, op } #endif - /* '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; + /* If 'number' is set, reset 'relativenumber'. */ + /* If 'relativenumber' is set, reset 'number'. */ + else if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu) + { + curwin->w_p_rnu = FALSE; + + /* Only reset the global value if the own value is set globally. */ + if (((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)) curwin->w_allbuf_opt.wo_rnu = FALSE; - } - if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu) - { - curwin->w_p_nu = FALSE; + } + else if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu) + { + curwin->w_p_nu = FALSE; + + /* Only reset the global value if the own value is set globally. */ + if (((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)) curwin->w_allbuf_opt.wo_nu = FALSE; - } + } + else if ((int *)varp == &curwin->w_allbuf_opt.wo_nu + && curwin->w_allbuf_opt.wo_nu) + { + curwin->w_allbuf_opt.wo_rnu = FALSE; + } + else if ((int *)varp == &curwin->w_allbuf_opt.wo_rnu + && curwin->w_allbuf_opt.wo_rnu) + { + curwin->w_allbuf_opt.wo_nu = FALSE; } else if ((int *)varp == &curbuf->b_p_ro)
--- 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
--- 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