From e94c54595ea92ea7c03b970f5e2b5ef60ae6f6af Mon Sep 17 00:00:00 2001 From: Ryan McGowan Date: Fri, 5 Jul 2013 16:01:24 -0700 Subject: [PATCH 1/2] Use s: prefixed variable names for scope. --- plugin/numbers.vim | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/plugin/numbers.vim b/plugin/numbers.vim index c281351..362e749 100644 --- a/plugin/numbers.vim +++ b/plugin/numbers.vim @@ -36,33 +36,33 @@ endif let s:save_cpo = &cpo set cpo&vim -let g:mode=0 -let g:center=1 +let s:mode=0 +let s:center=1 function! SetNumbers() - let g:mode = 1 + let s:mode = 1 call ResetNumbers() endfunc function! SetRelative() - let g:mode = 0 + let s:mode = 0 call ResetNumbers() endfunc function! NumbersToggle() - if (g:mode == 1) - let g:mode = 0 + if (s:mode == 1) + let s:mode = 0 set relativenumber else - let g:mode = 1 + let s:mode = 1 set number endif endfunc function! ResetNumbers() - if(g:center == 0) + if(s:center == 0) set number - elseif(g:mode == 0) + elseif(s:mode == 0) set relativenumber else set number @@ -70,12 +70,12 @@ function! ResetNumbers() endfunc function! Center() - let g:center = 1 + let s:center = 1 call ResetNumbers() endfunc function! Uncenter() - let g:center = 0 + let s:center = 0 call ResetNumbers() endfunc From c30ef58b07c0cfc11f1be1028c54025d1d9553cf Mon Sep 17 00:00:00 2001 From: Ryan McGowan Date: Fri, 5 Jul 2013 16:06:05 -0700 Subject: [PATCH 2/2] Instead of setting number just call nornu. Really the use of the number option should be part of the plugin but the current integration is poor. The nu and rnu means something different than nonu and rnu for instance. --- plugin/numbers.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/numbers.vim b/plugin/numbers.vim index 362e749..fdec49f 100644 --- a/plugin/numbers.vim +++ b/plugin/numbers.vim @@ -55,17 +55,17 @@ function! NumbersToggle() set relativenumber else let s:mode = 1 - set number + set norelativenumber endif endfunc function! ResetNumbers() if(s:center == 0) - set number + set norelativenumber elseif(s:mode == 0) set relativenumber else - set number + set norelativenumber end endfunc