Fix the load issue by unwrapping requires

supercollider · Aug 9, 2021 · 9b160ec · 9b160ec
1 parent 1415766
commit 9b160ec
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)