Merge branch 'issue-350'

Cask

@@ -12,11 +12,6 @@
  (depends-on "request-deferred")
  (depends-on "dash")
  (depends-on "cl-generic")
- (depends-on "company")
- (depends-on "ess")
- (depends-on "org-plus-contrib") ;; see https://github.com/cask/cask/issues/119
- (depends-on "markdown-mode")
- (depends-on "smartrep")
  (depends-on "ert-runner")
  (depends-on "ecukes")
  (depends-on "espuds")

lisp/ein-cell-edit.el

@@ -25,10 +25,15 @@
 
 ;;; Code:
 (require 'ein-cell)
-(require 'org-src)
 (require 'ess-r-mode nil t)
+(require 'org-src nil t)
 (require 'markdown-mode nil t)
 
+(autoload 'markdown-mode "markdown-mode")
+(autoload 'R-mode "ess-r-mode")
+(autoload 'org-src--remove-overlay "org-src")
+(autoload 'org-src-switch-to-buffer "org-src")
+
 (defvar ein:src--cell nil)
 (defvar ein:src--ws nil)
 (defvar ein:src--allow-write-back t)
@@ -80,7 +85,7 @@ or abort with \\[ein:edit-cell-abort]"))
   )
 
 (defun ein:cell-configure-edit-buffer ()
-  (when (bound-and-true-p org-src--from-org-mode)
+  (when (and (bound-and-true-p org-src--from-org-mode) (boundp 'org-src--beg-marker))
     (add-hook 'kill-buffer-hook #'org-src--remove-overlay nil 'local)
     (if (bound-and-true-p org-src--allow-write-back)
         (progn

lisp/ein-company.el

@@ -27,10 +27,13 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(require 'company)
 (require 'jedi-core nil t)
 (require 'deferred)
 (require 'ein-completer)
+(require 'company nil t)
+
+(autoload 'company-begin-backend "company")
+(autoload 'company-doc-buffer "company")
 
 ;; Duplicates ein:jedi--completer-complete in ein-jedi.
 ;; Let's refactor and enhance our calm!

lisp/ein-connect.el

@@ -31,10 +31,11 @@
 ;;; Code:
 
 (require 'eieio)
-(require 'company)
+(require 'company nil t)
 (require 'ein-notebook)
 (eval-when-compile (require 'auto-complete))
 
+(autoload 'company-mode "company")
 
 (declare-function ein:notebooklist-list-notebooks "ein-notebooklist")
 (declare-function ein:notebooklist-open-notebook-global "ein-notebooklist")
@@ -406,9 +407,11 @@ notebook."
     (ein:use-ac-jedi-backend (ein:jedi-complete-on-dot-install ein:connect-mode-map)
                              (auto-complete-mode +1))
     (ein:use-company-backend (company-mode +1)
-                             (add-to-list 'company-backends 'ein:company-backend))
+                             (when (boundp 'company-backends)
+                               (add-to-list 'company-backends 'ein:company-backend)))
     (ein:use-company-jedi-backend (company-mode +1)
-                                  (add-to-list 'company-backends 'ein:company-backend))
+                                  (when (boundp 'company-backends)
+                                    (add-to-list 'company-backends 'ein:company-backend)))
 
     (t (warn "No autocompletion backend has been selected - see `ein:completion-backend'."))))
 

lisp/ein-notebook.el

@@ -37,7 +37,7 @@
 (eval-when-compile (require 'auto-complete))
 
 (require 'ewoc)
-(require 'company)
+(require 'company nil t)
 
 (require 'ein-core)
 (require 'ein-classes)
@@ -1584,10 +1584,12 @@ This hook is run regardless the actual major mode used."
                         (auto-complete-mode +1))
     (ein:use-ac-jedi-backend (ein:jedi-complete-on-dot-install ein:notebook-mode-map)
                              (auto-complete-mode +1))
-    (ein:use-company-backend (add-to-list 'company-backends 'ein:company-backend)
-                             (company-mode +1))
+    (ein:use-company-backend 
+     (when (boundp 'company-backends) (add-to-list 'company-backends 'ein:company-backend))
+     (company-mode +1))
     (ein:use-company-jedi-backend (warn "Support for jedi+company currently not implemented. Defaulting to just company-mode")
-                                  (add-to-list 'company-backends 'ein:company-backend)
+                                  (when (boundp 'company-backends)
+                                    (add-to-list 'company-backends 'ein:company-backend))
                                   (company-mode +1))
 
     (t (warn "No autocompletion backend has been selected - see `ein:completion-backend'.")))

lisp/ein-smartrep.el

@@ -28,6 +28,8 @@
 (require 'smartrep nil t)
 (require 'ein-notebook)
 
+(autoload 'smartrep-define-key "smartrep")
+
 (defcustom ein:smartrep-notebook-mode-alist
   '(("C-t" . ein:worksheet-toggle-cell-type)
     ("C-l" . ein:worksheet-clear-output)

lisp/ein-subpackages.el

@@ -100,9 +100,11 @@ When this option is enabled, cached omni completion is available."
                               (ein:jedi-setup)
                               (ein:ac-config-once ein:use-auto-complete-superpack))
     (ein:use-company-backend  (require 'ein-company)
-                              (add-to-list 'company-backends 'ein:company-backend))
+                              (when (boundp 'company-backends)
+                                (add-to-list 'company-backends 'ein:company-backend)))
     (ein:use-company-jedi-backend (require 'ein-company)
-                                  (add-to-list 'company-backends 'ein:company-backend))
+                                  (when (boundp 'company-backends)
+                                    (add-to-list 'company-backends 'ein:company-backend)))
     (ein:use-custom-backend  (warn "Automatic configuration of autocompletiong for EIN is disabled."))
     (t (if (and (boundp 'ein:use-auto-complete)
                 (not (featurep 'company)))

lisp/ob-ein.el

@@ -36,8 +36,8 @@
 (require 'cl)
 (require 'ein-notebook)
 (require 'ein-shared-output)
-(require 'org-src)
-(require 'org-element)
+(require 'org-src nil t)
+(require 'org-element nil t)
 (require 'ein-utils)
 (require 'python)
 
@@ -247,12 +247,13 @@ jupyter kernels.
 
 (defun org-babel-edit:ein-execute ()
   (interactive)
-  (let* ((beg org-src--beg-marker)
-         (buf (marker-buffer beg)))
-    (with-current-buffer buf
-      (save-excursion
-        (goto-char beg)
-        (org-ctrl-c-ctrl-c)))))
+  (when (boundp 'org-src--beg-marker)
+    (let* ((beg org-src--beg-marker)
+           (buf (marker-buffer beg)))
+      (with-current-buffer buf
+        (save-excursion
+          (goto-char beg)
+          (org-ctrl-c-ctrl-c))))))
 
 ;; This function should be used to assign any variables in params in
 ;; the context of the session environment.