From c61b4b6fc859b5fc380edfadd83a1eb436b1d772 Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Fri, 5 Mar 2021 13:48:45 +0200
Subject: [PATCH] Fix conditional use of 'require-theme'

This snippet is courtesy of Basil L. Contovounesios.  It is meant to
make the themes load their main library regardless of version or setup,
as discussed in issue 162:
<https://gitlab.com/protesilaos/modus-themes/-/issues/162>.
---
 modus-operandi-theme.el | 5 ++++-
 modus-vivendi-theme.el  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index bcde386..6274088 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -50,7 +50,10 @@
 
 
 
-(require 'modus-themes)
+(eval-and-compile
+  (unless (and (fboundp 'require-theme)
+               (require-theme 'modus-themes t))
+    (require 'modus-themes)))
 
 (deftheme modus-operandi
   "Accessible and customizable light theme (WCAG AAA standard).
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index d290929..347e6d2 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -50,7 +50,10 @@
 
 
 
-(require 'modus-themes)
+(eval-and-compile
+  (unless (and (fboundp 'require-theme)
+               (require-theme 'modus-themes t))
+    (require 'modus-themes)))
 
 (deftheme modus-vivendi
   "Accessible and customizable dark theme (WCAG AAA standard).