From fbe2b356e2b888010252b7defd74e948cbda1564 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 31 May 2020 01:51:33 +1200
Subject: Move plugin settings into vim/after and test var

---
 vim/after/plugin/2html.vim           | 11 +++++++++++
 vim/after/plugin/spellfile_local.vim |  5 +++++
 vim/plugin/2html.vim                 |  5 -----
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 vim/after/plugin/2html.vim
 delete mode 100644 vim/plugin/2html.vim

diff --git a/vim/after/plugin/2html.vim b/vim/after/plugin/2html.vim
new file mode 100644
index 00000000..dd65486d
--- /dev/null
+++ b/vim/after/plugin/2html.vim
@@ -0,0 +1,11 @@
+" Don't make these settings if the base plugin didn't load
+if !exists('g:loaded_2html_plugin')
+  finish
+endif
+
+" Set preferred fonts for the HTML rendering
+let g:html_font = [
+      \ 'DejaVu Sans Mono',
+      \ 'Ubuntu Mono',
+      \ 'Consolas',
+      \]
diff --git a/vim/after/plugin/spellfile_local.vim b/vim/after/plugin/spellfile_local.vim
index 1655e78c..7d805660 100644
--- a/vim/after/plugin/spellfile_local.vim
+++ b/vim/after/plugin/spellfile_local.vim
@@ -1,3 +1,8 @@
+" Don't make these settings if the base plugin didn't load
+if !exists('g:loaded_spellfile_local')
+  finish
+endif
+
 " Use XDG dirs for 'spellfile' if XDG_DATA_HOME is useable
 if xdg#DataHome() !=# ''
   let g:spellfile_local_dirs = [ xdg#DataHome() ]
diff --git a/vim/plugin/2html.vim b/vim/plugin/2html.vim
deleted file mode 100644
index 51d377e3..00000000
--- a/vim/plugin/2html.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:html_font = [
-      \ 'DejaVu Sans Mono',
-      \ 'Ubuntu Mono',
-      \ 'Consolas',
-      \]
-- 
cgit v1.2.3


From 0e1d0bf25e784e5403cfcd536b646bbed3718f8c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 31 May 2020 01:55:44 +1200
Subject: Bump VERSION

---
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 1bbd9ee2..d3f4b56f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.14.0
-Sat, 30 May 2020 13:28:41 +0000
+tejr dotfiles v9.15.0
+Sat, 30 May 2020 13:55:44 +0000
-- 
cgit v1.2.3