From 1f2ab8d4fecbc7b1061dd4108d33962621017d25 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 21:53:03 +1200 Subject: Drop Vim 6.x support --- plugin/redact_pass.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/redact_pass.vim b/plugin/redact_pass.vim index 47c422d..42064e4 100644 --- a/plugin/redact_pass.vim +++ b/plugin/redact_pass.vim @@ -11,7 +11,7 @@ if exists('loaded_redact_pass') || &compatible finish endif -if !has('autocmd') || v:version < 600 +if v:version < 700 finish endif let loaded_redact_pass = 1 -- cgit v1.2.3 From 66fa75c8ca81e012079a69e9e4f0bd2ca69f0a09 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 21:55:51 +1200 Subject: Move code into autoloaded function --- plugin/redact_pass.vim | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'plugin') diff --git a/plugin/redact_pass.vim b/plugin/redact_pass.vim index 42064e4..3e30d88 100644 --- a/plugin/redact_pass.vim +++ b/plugin/redact_pass.vim @@ -16,30 +16,6 @@ if v:version < 700 endif let loaded_redact_pass = 1 -" Check whether we should set redacting options or not -function! s:CheckArgsRedact() - - " Ensure there's one argument and it's the matched file - if argc() != 1 || fnamemodify(argv(0), ':p') !=# expand(':p') - return - endif - - " Disable all the leaky options globally - set nobackup - set nowritebackup - set noswapfile - set viminfo= - if has('persistent_undo') - set noundofile - endif - - " Tell the user what we're doing so they know this worked, via a message and - " a global variable they can check - echomsg 'Editing password file--disabled leaky options!' - let g:redact_pass_redacted = 1 - -endfunction - " Auto function loads only when Vim starts up augroup redact_pass autocmd! @@ -47,5 +23,5 @@ augroup redact_pass \ /dev/shm/pass.?*/?*.txt \,$TMPDIR/pass.?*/?*.txt \,/tmp/pass.?*/?*.txt - \ call s:CheckArgsRedact() + \ call redact_pass#CheckArgsRedact() augroup END -- cgit v1.2.3 From 7ed8926958184a09811314d39233ea4311188b4a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 25 May 2019 21:56:31 +1200 Subject: Move load guard tests inline --- plugin/redact_pass.vim | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'plugin') diff --git a/plugin/redact_pass.vim b/plugin/redact_pass.vim index 3e30d88..06c5606 100644 --- a/plugin/redact_pass.vim +++ b/plugin/redact_pass.vim @@ -8,10 +8,7 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('loaded_redact_pass') || &compatible - finish -endif -if v:version < 700 +if exists('loaded_redact_pass') || &compatible || v:version < 700 finish endif let loaded_redact_pass = 1 -- cgit v1.2.3