Reshape autoloads into noun#Verb() pattern

6 files changed, 25 insertions, 35 deletions

diff --git a/vim/autoload/argument.vim b/vim/autoload/argument.vim
new file mode 100644
index 00000000..9e381000
--- /dev/null
+++ b/vim/autoload/argument.vim
@@ -0,0 +1,6 @@
+function! argument#Escape(argument) abort
+  return exists('*fnameescape')
+        \ ? fnameescape(a:argument)
+        \ : escape(a:argument, "\n\r\t".' *?[{`$\%#''"|!<')
+endfunction
+
diff --git a/vim/autoload/escape.vim b/vim/autoload/escape.vim
deleted file mode 100644
index 37ac3e8b..00000000
--- a/vim/autoload/escape.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-" Escape text for use as an Ex command argument
-function! escape#Arg(arg) abort
-  return exists('*fnameescape')
-        \ ? fnameescape(a:arg)
-        \ : escape(a:arg, "\n\r\t".' *?[{`$\%#''"|!<')
-endfunction
-
-" Escape text for use as a list item
-function! escape#Item(item) abort
-  return escape(a:item, ',')
-endfunction
-
-" Escape wildcard characters in list items to prevent e.g. tilde or glob
-" expansion in the resulting item
-"
-function! escape#Wild(string) abort
-  return escape(a:string, '\*?[{`''$~')
-endfunction
diff --git a/vim/autoload/option.vim b/vim/autoload/option.vim
new file mode 100644
index 00000000..d203dfe8
--- /dev/null
+++ b/vim/autoload/option.vim
@@ -0,0 +1,8 @@
+function! option#Split(expr, ...) abort
+  if a:0 > 1
+    echoerr 'Too many arguments'
+  endif
+  let keepempty = a:0 ? a:1 : 0
+  let parts = split(a:expr, '\\\@<!,[, ]*', keepempty)
+  return map#(parts, 'substitute(v:val, ''\\,'', '','', ''g'')')
+endfunction
diff --git a/vim/autoload/option/item.vim b/vim/autoload/option/item.vim
new file mode 100644
index 00000000..6081fa8b
--- /dev/null
+++ b/vim/autoload/option/item.vim
@@ -0,0 +1,11 @@
+function! option#item#Escape(item, ...) abort
+  if a:0 > 1
+    echoerr 'Too many arguments'
+  endif
+  let item = a:item
+  let wild = a:0 ? a:1 : 0
+  if wild
+    let item = substitute(item, '\\,', ',', 'g')
+  endif
+  return escape(item, ',')
+endfunction
diff --git a/vim/autoload/split.vim b/vim/autoload/split.vim
deleted file mode 100644
index 44065094..00000000
--- a/vim/autoload/split.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-if v:version < 702 || v:version == 702 && !has('patch-61')
-  runtime autoload/unescape.vim
-endif
-
-function! split#Option(expr, ...) abort
-  if a:0 > 2
-    echoerr 'Too many arguments'
-  endif
-  let keepempty = a:0 ? a:1 : 0
-  let parts = split(a:expr, '\\\@<!,[, ]*', keepempty)
-  return map#(parts, function('unescape#Item'))
-endfunction
diff --git a/vim/autoload/unescape.vim b/vim/autoload/unescape.vim
deleted file mode 100644
index d42403f8..00000000
--- a/vim/autoload/unescape.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Unescape a list item escaped with escape#Item(), by replacing all escaped
-" commas with unescaped ones
-function! unescape#Item(key, val) abort
-  return substitute(a:val, '\\,', ',', 'g')
-endfunction