From 72d9052d35e05f35cb05270ff498e929c6071723 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@outlook.com>
Date: Wed, 9 May 2018 20:36:35 +0800
Subject: [PATCH] Fix rtp

---
 autoload/SpaceVim/custom.vim | 21 +++++++++++----------
 config/main.vim              |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/autoload/SpaceVim/custom.vim b/autoload/SpaceVim/custom.vim
index 3817ce40b..733d65fd4 100644
--- a/autoload/SpaceVim/custom.vim
+++ b/autoload/SpaceVim/custom.vim
@@ -105,6 +105,7 @@ function! SpaceVim#custom#load() abort
   " if file .SpaceVim.d/init.toml exist 
   if filereadable('.SpaceVim.d/init.toml')
     let g:_spacevim_config_path = '.SpaceVim.d/init.toml'
+    let &rtp =  fnamemodify('.SpaceVim.d', ':p:h') . ',' . &rtp
     let local_conf = fnamemodify('.SpaceVim.d/init.toml', ':p')
     call SpaceVim#logger#info('find config file: ' . local_conf)
     let local_conf_cache = s:path_to_fname(local_conf)
@@ -124,7 +125,7 @@ function! SpaceVim#custom#load() abort
     endif
   elseif filereadable('.SpaceVim.d/init.vim')
     let g:_spacevim_config_path = '.SpaceVim.d/init.vim'
-    exe 'set rtp ^=' . fnamemodify('.SpaceVim.d', ':p')
+    let &rtp =  fnamemodify('.SpaceVim.d', ':p:h') . ',' . &rtp
     exe 'source .SpaceVim.d/init.vim'
     if g:spacevim_force_global_config
       call s:load_glob_conf()
@@ -143,10 +144,10 @@ endfunction
 
 
 function! s:load_glob_conf() abort
-  let global_dir = empty($SPACEVIMDIR) ? expand('~/.SpaceVim.d/') : $SPACEVIMDIR
-  if filereadable(global_dir . 'init.toml')
-    let g:_spacevim_global_config_path = global_dir . 'init.toml'
-    let local_conf = global_dir . 'init.toml'
+  let global_dir = empty($SPACEVIMDIR) ? expand('~/.SpaceVim.d') : $SPACEVIMDIR
+  if filereadable(global_dir . '/init.toml')
+    let g:_spacevim_global_config_path = global_dir . '/init.toml'
+    let local_conf = global_dir . '/init.toml'
     let local_conf_cache = expand('~/.cache/SpaceVim/conf/init.json')
     if getftime(local_conf) < getftime(local_conf_cache)
       let conf = s:JSON.json_decode(join(readfile(local_conf_cache, ''), ''))
@@ -156,11 +157,11 @@ function! s:load_glob_conf() abort
       call writefile([s:JSON.json_encode(conf)], local_conf_cache)
       call SpaceVim#custom#apply(conf)
     endif
-    exe 'set runtimepath^=' . global_dir
-  elseif filereadable(global_dir . 'init.vim')
-    let g:_spacevim_global_config_path = global_dir . 'init.vim'
-    let custom_glob_conf = global_dir . 'init.vim'
-    exe 'set runtimepath^=' . global_dir
+    let &rtp = global_dir . ',' . &rtp
+  elseif filereadable(global_dir . '/init.vim')
+    let g:_spacevim_global_config_path = global_dir . '/init.vim'
+    let custom_glob_conf = global_dir . '/init.vim'
+    let &rtp = global_dir . ',' . &rtp
     exe 'source ' . custom_glob_conf
   else
     if has('timers')
diff --git a/config/main.vim b/config/main.vim
index 4db35376b..e87d21d7c 100644
--- a/config/main.vim
+++ b/config/main.vim
@@ -21,7 +21,7 @@ try
   call SpaceVim#begin()
 catch
   " Update the rtp only when SpaceVim is not contained in runtimepath.
-  execute 'set rtp +=' . fnamemodify(g:_spacevim_root_dir, ':p:h:h')
+  let &runtimepath += ',' . fnamemodify(g:_spacevim_root_dir, ':p:h:h')
   call SpaceVim#begin()
 endtry