From ad7cb8319053250e4f2a2eb559bd942e741ba9b5 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 4 Nov 2017 17:35:09 +1300
Subject: Rename and refactor option toggle plugin

Renamed to flag_toggle.vim and placed in autoload using the namespaced
autoload function syntax.

I'm not sure this is the right approach yet, but I seem to pretty rarely
use a Vim earlier than 7.1 these days.
---
 vim/autoload/flag_toggle.vim | 89 +++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

(limited to 'vim/autoload')

diff --git a/vim/autoload/flag_toggle.vim b/vim/autoload/flag_toggle.vim
index 10739149..2ff4584d 100644
--- a/vim/autoload/flag_toggle.vim
+++ b/vim/autoload/flag_toggle.vim
@@ -1,5 +1,5 @@
 "
-" option_flags.vim: Provide functions to toggle flags in single-char grouped
+" flag_toggle.vim: Provide functions to toggle flags in single-char grouped
 " options like 'formatoptions', 'shortmess', 'complete' etc.
 "
 " This will fail hilariously if you try to set e.g. 'switchbuf' with it!
@@ -7,48 +7,45 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if has('eval')
-
-  " Public wrapper function to toggle a flag with 'set'
-  function! option_flags#toggle(option, flag)
-    call s:toggle(a:option, a:flag, 0)
-  endfunction
-
-  " Public wrapper function to toggle a flag with 'setlocal'
-  function! option_flags#toggle_local(option, flag)
-    call s:toggle(a:option, a:flag, 1)
-  endfunction
-
-  " Internal function to do the toggling
-  function! s:toggle(option, flag, local)
-
-    " Check for weird options, we don't want to eval() anything funny
-    if a:option =~# '[^a-z]'
-      echoerr 'Illegal option name'
-      return
-    endif
-
-    " Weird flags, too; should be a single inoffensive char
-    if a:flag !~# '^[a-z0-9.]$'
-      echoerr 'Illegal flag'
-      return
-    endif
-
-    " Choose which set command to use
-    if a:local
-      let l:set = 'setlocal '
-    else
-      let l:set = 'set '
-    endif
-
-    " Use eval() to assign -= or += to l:op for the option toggle
-    " (I couldn't get {curly braces} indirection to work)
-    let l:op = ''
-    execute 'let l:op = &'.a:option.' =~# a:flag ? "-=" : "+="'
-
-    " Use eval() to perform the option toggle and then print the value
-    execute l:set . ' ' . a:option . l:op . a:flag . ' ' . a:option . '?'
-
-  endfunction
-
-endif
+
+" Public wrapper function to toggle a flag with 'set'
+function! flag_toggle#Toggle(option, flag)
+  call s:Toggle(a:option, a:flag, 0)
+endfunction
+
+" Public wrapper function to toggle a flag with 'setlocal'
+function! flag_toggle#ToggleLocal(option, flag)
+  call s:Toggle(a:option, a:flag, 1)
+endfunction
+
+" Internal function to do the toggling
+function! s:Toggle(option, flag, local)
+
+  " Check for weird options, we don't want to eval() anything funny
+  if a:option =~# '[^a-z]'
+    echoerr 'Illegal option name'
+    return
+  endif
+
+  " Weird flags, too; should be a single inoffensive char
+  if a:flag !~# '^[a-z0-9.]$'
+    echoerr 'Illegal flag'
+    return
+  endif
+
+  " Choose which set command to use
+  if a:local
+    let l:set = 'setlocal '
+  else
+    let l:set = 'set '
+  endif
+
+  " Use eval() to assign -= or += to l:op for the option toggle
+  " (I couldn't get {curly braces} indirection to work)
+  let l:op = ''
+  execute 'let l:op = &'.a:option.' =~# a:flag ? "-=" : "+="'
+
+  " Use eval() to perform the option toggle and then print the value
+  execute l:set . ' ' . a:option . l:op . a:flag . ' ' . a:option . '?'
+
+endfunction
-- 
cgit v1.2.3