From 55e0b6d4cb731fd9e4a4ef058c373374794a9ee1 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 27 Jun 2019 08:52:53 +1200
Subject: Factor out option split into a function

---
 vim/vimrc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 0e202b70..1d551835 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,15 +2,17 @@ if !exists('$LANG') && &encoding ==# 'latin1'
   set encoding=utf-8
 endif
 scriptencoding utf-8
-if exists('$MYVIM')
-  execute 'set runtimepath^='.escape(escape(
-        \ $MYVIM,
-        \ ','), '\ %#|"')
-else
-  let $MYVIM = map(
+function! s:OptionSplit(string) abort
+  return map(
         \ split(&runtimepath, '\\\@<!,[, ]*'),
         \ 'substitute(v:val, ''\\,'', '','', ''g'')',
-        \)[0]
+        \)
+endfunction
+if exists('$MYVIM')
+  execute 'set runtimepath^='.s:EscItemExec($MYVIM)
+else
+  let s:runtimepath = s:OptionSplit(&runtimepath)
+  let $MYVIM = s:runtimepath[0]
 endif
 let s:cache = $MYVIM.'/cache'
 if !isdirectory(s:cache)
-- 
cgit v1.2.3