From 7cbef1668e9208d7d6d570a58ba120d1e7b17c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Sun, 22 Feb 2015 11:43:04 +0100
Subject: [PATCH] Fixed home directory handling

---
 vimrc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index dfec902..10c887d 100644
--- a/vimrc
+++ b/vimrc
@@ -5,14 +5,19 @@
 let s:own_path = expand( '<sfile>:p:h' )
 let $VIM_HOME = $VIM_HOME == '' ? '' 
 	\ : fnamemodify( $VIM_HOME . '/x' , ':p:h' )
+
 if $VIM_HOME == '' || $VIM_HOME == s:own_path
+	" Default configuration directory
 	let $VIM_HOME = s:own_path
 	let g:vim_home = fnameescape( $VIM_HOME )
 	let g:vim_vimrc = fnameescape( $VIM_HOME . '/vimrc' )
 else
+	" Use another configuration directory
 	let g:vim_home = fnameescape( $VIM_HOME )
 	let g:vim_vimrc = fnameescape( $VIM_HOME . '/vimrc' )
-	let &rtp = g:vim_home
+	let &rtp = printf(
+		\ '%s/vimfiles,%s,%s,%s/vimfiles/after,%s/after' ,
+		\ $VIM , $VIMRUNTIME , g:vim_home , $VIM , g:vim_home )
 	if filereadable( g:vim_vimrc )
 		execute 'source ' . g:vim_vimrc
 	endif