Fix the load issue by unwrapping requires

This commit is contained in:
John Andrews 2021-08-09 12:05:52 -04:00
parent 14157663b0
commit 9b160ec102
6 changed files with 15 additions and 28 deletions

View file

@ -13,13 +13,8 @@
;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
;; USA ;; USA
(require 'sclang-util)
(eval-when-compile (require 'sclang-interp)
(require 'sclang-util)
(require 'sclang-interp)
)
(sclang-set-command-handler (sclang-set-command-handler
'openDevSource 'openDevSource

View file

@ -15,9 +15,8 @@
;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
;; USA ;; USA
(eval-when-compile (require 'sclang-util)
(require 'sclang-util) (require 'compile)
(require 'compile))
;; ===================================================================== ;; =====================================================================
;; post buffer access ;; post buffer access

View file

@ -16,11 +16,8 @@
;;; along with this program; if not, write to the Free Software ;;; along with this program; if not, write to the Free Software
;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
(eval-when-compile (require 'sclang-util)
(require 'sclang-util) (require 'sclang-mode)
(require 'sclang-mode)
)
(easy-mmode-define-minor-mode sclang-minor-mode (easy-mmode-define-minor-mode sclang-minor-mode
"Toggle sclang-minor-mode. "Toggle sclang-minor-mode.

View file

@ -24,10 +24,8 @@
(declare-function company-mode "ext:company") (declare-function company-mode "ext:company")
(defvar company-backends) (defvar company-backends)
(eval-when-compile (require 'font-lock)
(require 'font-lock) (require 'sclang-util)
(require 'sclang-util))
(require 'sclang-interp) (require 'sclang-interp)
(require 'sclang-language) (require 'sclang-language)
(require 'sclang-dev) (require 'sclang-dev)

View file

@ -16,12 +16,10 @@
;; USA ;; USA
(require 'cl-lib) (require 'cl-lib)
(require 'sclang-util)
(eval-when-compile (require 'sclang-interp)
(require 'sclang-util) (require 'sclang-language)
(require 'sclang-interp) (require 'sclang-mode)
(require 'sclang-language)
(require 'sclang-mode))
(defcustom sclang-server-panel "Server.default.makeWindow" (defcustom sclang-server-panel "Server.default.makeWindow"
"Expression to execute when `sclang-show-server-panel' is invoked." "Expression to execute when `sclang-show-server-panel' is invoked."

View file

@ -27,9 +27,9 @@
;;; Code: ;;; Code:
(require 'cl-lib) (require 'cl-lib)
(eval-when-compile (require 'sclang-util) (require 'sclang-util)
(require 'sclang-language)) (require 'sclang-language)
(eval-and-compile (require 'sclang-interp)) (require 'sclang-interp)
(defvar sclang-widgets nil) (defvar sclang-widgets nil)
(make-variable-buffer-local 'sclang-widgets) (make-variable-buffer-local 'sclang-widgets)