From e88643652f20e1020d2b7269bd9506834b89b28c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 9 Jun 2019 15:54:28 +1200
Subject: Check value of MYVIM before hooking into subfile

---
 vim/vimrc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vim/vimrc b/vim/vimrc
index dbf2e5da..0daff902 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -170,8 +170,12 @@ command! FileTypeReload
 " that they only run once.
 "
 if exists('##SourceCmd')
-  autocmd vimrc SourceCmd $MYVIMRC,$MYVIM/vimrc
+  autocmd vimrc SourceCmd $MYVIMRC
         \ source <afile> | FileTypeReload
+  if $MYVIM !=# ''
+    autocmd vimrc SourceCmd $MYVIM/vimrc
+          \ doautocmd vimrc SourceCmd $MYVIMRC
+  endif
 endif
 
 " Keep the viminfo file in a cache subdirectory of $MYVIM, creating that
-- 
cgit v1.2.3