(require 'ein-utils) -> (require 'ein-core)

lisp/ein-ac.el

@@ -28,7 +28,7 @@
 (eval-when-compile (require 'cl))
 (require 'auto-complete nil t)
 
-(require 'ein-utils)
+(require 'ein-core)
 (eval-when-compile (require 'ein-notebook)
                    (defvar ein:mumamo-codecell-mode))
 

lisp/ein-cell.el

@@ -36,8 +36,8 @@
 (require 'ansi-color)
 (require 'comint)
 
+(require 'ein-core)
 (require 'ein-log)
-(require 'ein-utils)
 (require 'ein-node)
 (require 'ein-kernel)
 

lisp/ein-completer.el

@@ -27,8 +27,7 @@
 
 (declare-function ac-cursor-on-diable-face-p "auto-complete")
 
-(require 'ein)
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-log)
 (require 'ein-subpackages)
 (require 'ein-kernel)

lisp/ein-connect.el

@@ -33,7 +33,6 @@
 (require 'eieio)
 (eval-when-compile (require 'auto-complete nil t))
 
-(require 'ein)
 (require 'ein-notebook)
 
 (declare-function ein:notebooklist-list-notebooks "ein-notebooklist")

lisp/ein-console.el

@@ -26,8 +26,7 @@
 ;;; Code:
 
 
-(require 'ein)
-(require 'ein-utils)
+(require 'ein-core)
 
 ;; Functions from `Fabian Gallina's python.el`_
 ;; NOTE: Do *not* load python.el here, since user may be using the other

lisp/ein-events.el

@@ -28,8 +28,8 @@
 (eval-when-compile (require 'cl))
 (require 'eieio)
 
+(require 'ein-core)
 (require 'ein-log)
-(require 'ein-utils)
 
 
 ;;; Events handling class

lisp/ein-kernel.el

@@ -28,8 +28,8 @@
 (eval-when-compile (require 'cl))
 (require 'ansi-color)
 
+(require 'ein-core)
 (require 'ein-log)
-(require 'ein-utils)
 (require 'ein-websocket)
 (require 'ein-events)
 (require 'ein-query)

lisp/ein-log.el

@@ -26,7 +26,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(require 'ein-utils)
+(require 'ein-core)
 
 
 (defvar ein:log-all-buffer-name " *ein:log-all*")

lisp/ein-node.el

@@ -28,7 +28,7 @@
 (eval-when-compile (require 'cl))
 (require 'ewoc)
 
-(require 'ein-utils)
+(require 'ein-core)
 
 
 (defstruct ein:$node

lisp/ein-notebook.el

@@ -37,7 +37,7 @@
 (require 'ewoc)
 (eval-when-compile (require 'auto-complete nil t))
 
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-log)
 (require 'ein-node)
 (require 'ein-kernel)

lisp/ein-notebooklist.el

@@ -28,7 +28,7 @@
 (eval-when-compile (require 'cl))
 (require 'widget)
 
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-notebook)
 (require 'ein-subpackages)
 

lisp/ein-notification.el

@@ -28,7 +28,7 @@
 (eval-when-compile (require 'cl))
 (require 'eieio)
 
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-events)
 
 

lisp/ein-pager.el

@@ -27,7 +27,7 @@
 
 (require 'ansi-color)
 
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-events)
 
 (defun ein:pager-new (name events)

lisp/ein-pytools.el

@@ -31,7 +31,6 @@
 (declare-function ses-yank-tsf "ses")
 (declare-function ses-command-hook "ses")
 
-(require 'ein)
 (require 'ein-kernel)
 
 (defun ein:goto-file (filename lineno &optional other-window)

lisp/ein-query.el

@@ -28,7 +28,7 @@
 (eval-when-compile (require 'cl))
 (require 'url)
 
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-log)
 
 

lisp/ein-traceback.el

@@ -30,8 +30,7 @@
 (require 'ewoc)
 (require 'ansi-color)
 
-(require 'ein)
-(require 'ein-utils)
+(require 'ein-core)
 
 (defclass ein:traceback ()
   ((tb-data :initarg :tb-data :type list)

lisp/ein-websocket.el

@@ -28,7 +28,7 @@
 (eval-when-compile (require 'cl))
 (require 'websocket)
 
-(require 'ein-utils)
+(require 'ein-core)
 
 
 (defstruct ein:$websocket

lisp/ein-worksheet.el

@@ -30,8 +30,7 @@
 (require 'eieio)
 (require 'ewoc)
 
-(require 'ein)
-(require 'ein-utils)
+(require 'ein-core)
 (require 'ein-cell)
 (require 'ein-notification)
 (require 'ein-kill-ring)