From 66fa75c8ca81e012079a69e9e4f0bd2ca69f0a09 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 25 May 2019 21:55:51 +1200
Subject: Move code into autoloaded function

---
 autoload/redact_pass.vim | 23 +++++++++++++++++++++++
 plugin/redact_pass.vim   | 26 +-------------------------
 2 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 autoload/redact_pass.vim

diff --git a/autoload/redact_pass.vim b/autoload/redact_pass.vim
new file mode 100644
index 0000000..da1c101
--- /dev/null
+++ b/autoload/redact_pass.vim
@@ -0,0 +1,23 @@
+" Check whether we should set redacting options or not
+function! redact_pass#CheckArgsRedact() abort
+
+  " Ensure there's one argument and it's the matched file
+  if argc() != 1 || fnamemodify(argv(0), ':p') !=# expand('<afile>: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
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('<afile>: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