From 9b160ec102dce546d63d6da7e702aae749dc50db Mon Sep 17 00:00:00 2001
From: John Andrews <john.m.andrews@gmail.com>
Date: Mon, 9 Aug 2021 12:05:52 -0400
Subject: [PATCH] Fix the load issue by unwrapping requires

---
 el/sclang-dev.el        |  9 ++-------
 el/sclang-interp.el     |  5 ++---
 el/sclang-minor-mode.el |  7 ++-----
 el/sclang-mode.el       |  6 ++----
 el/sclang-server.el     | 10 ++++------
 el/sclang-widgets.el    |  6 +++---
 6 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/el/sclang-dev.el b/el/sclang-dev.el
index 440409c..211082d 100644
--- a/el/sclang-dev.el
+++ b/el/sclang-dev.el
@@ -13,13 +13,8 @@
 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 ;; USA
 
-
-(eval-when-compile
-  (require 'sclang-util)
-  (require 'sclang-interp)
-  )
-
-
+(require 'sclang-util)
+(require 'sclang-interp)
 
 (sclang-set-command-handler
   'openDevSource
diff --git a/el/sclang-interp.el b/el/sclang-interp.el
index 1bf7308..04a9a41 100644
--- a/el/sclang-interp.el
+++ b/el/sclang-interp.el
@@ -15,9 +15,8 @@
 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 ;; USA
 
-(eval-when-compile
-  (require 'sclang-util)
-  (require 'compile))
+(require 'sclang-util)
+(require 'compile)
 
 ;; =====================================================================
 ;; post buffer access
diff --git a/el/sclang-minor-mode.el b/el/sclang-minor-mode.el
index caf5416..c5e2a47 100644
--- a/el/sclang-minor-mode.el
+++ b/el/sclang-minor-mode.el
@@ -16,11 +16,8 @@
 ;;; along with this program; if not, write to the Free Software
 ;;;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
-(eval-when-compile
-  (require 'sclang-util)
-  (require 'sclang-mode)
-  )
-
+(require 'sclang-util)
+(require 'sclang-mode)
 
 (easy-mmode-define-minor-mode sclang-minor-mode
   "Toggle sclang-minor-mode.
diff --git a/el/sclang-mode.el b/el/sclang-mode.el
index ad7b626..0f42491 100644
--- a/el/sclang-mode.el
+++ b/el/sclang-mode.el
@@ -24,10 +24,8 @@
 (declare-function company-mode "ext:company")
 (defvar company-backends)
 
-(eval-when-compile
-  (require 'font-lock)
-  (require 'sclang-util))
-
+(require 'font-lock)
+(require 'sclang-util)
 (require 'sclang-interp)
 (require 'sclang-language)
 (require 'sclang-dev)
diff --git a/el/sclang-server.el b/el/sclang-server.el
index 1f948db..375c492 100644
--- a/el/sclang-server.el
+++ b/el/sclang-server.el
@@ -16,12 +16,10 @@
 ;; USA
 
 (require 'cl-lib)
-
-(eval-when-compile
-  (require 'sclang-util)
-  (require 'sclang-interp)
-  (require 'sclang-language)
-  (require 'sclang-mode))
+(require 'sclang-util)
+(require 'sclang-interp)
+(require 'sclang-language)
+(require 'sclang-mode)
 
 (defcustom sclang-server-panel "Server.default.makeWindow"
   "Expression to execute when `sclang-show-server-panel' is invoked."
diff --git a/el/sclang-widgets.el b/el/sclang-widgets.el
index 45f9475..d5aa3c6 100644
--- a/el/sclang-widgets.el
+++ b/el/sclang-widgets.el
@@ -27,9 +27,9 @@
 ;;; Code:
 
 (require 'cl-lib)
-(eval-when-compile (require 'sclang-util)
-                   (require 'sclang-language))
-(eval-and-compile (require 'sclang-interp))
+(require 'sclang-util)
+(require 'sclang-language)
+(require 'sclang-interp)
 
 (defvar sclang-widgets nil)
 (make-variable-buffer-local 'sclang-widgets)