diff options
Diffstat (limited to 'lisp/org/ob-R.el')
| -rw-r--r-- | lisp/org/ob-R.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el index 4ee091118e4..f2cc069aa5e 100644 --- a/lisp/org/ob-R.el +++ b/lisp/org/ob-R.el | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | (require 'ob) | 36 | (require 'ob) |
| 37 | 37 | ||
| 38 | (declare-function orgtbl-to-tsv "org-table" (table params)) | 38 | (declare-function orgtbl-to-tsv "org-table" (table params)) |
| 39 | (declare-function R "ext:essd-r" (&optional start-args)) | 39 | (declare-function run-ess-r "ext:ess-r-mode" (&optional start-args)) |
| 40 | (declare-function inferior-ess-send-input "ext:ess-inf" ()) | 40 | (declare-function inferior-ess-send-input "ext:ess-inf" ()) |
| 41 | (declare-function ess-make-buffer-current "ext:ess-inf" ()) | 41 | (declare-function ess-make-buffer-current "ext:ess-inf" ()) |
| 42 | (declare-function ess-eval-buffer "ext:ess-inf" (vis)) | 42 | (declare-function ess-eval-buffer "ext:ess-inf" (vis)) |
| @@ -276,7 +276,8 @@ This function is called by `org-babel-execute-src-block'." | |||
| 276 | (when (get-buffer session) | 276 | (when (get-buffer session) |
| 277 | ;; Session buffer exists, but with dead process | 277 | ;; Session buffer exists, but with dead process |
| 278 | (set-buffer session)) | 278 | (set-buffer session)) |
| 279 | (require 'ess) (R) | 279 | (require 'ess-r-mode) |
| 280 | (set-buffer (run-ess-r)) | ||
| 280 | (let ((R-proc (get-process (or ess-local-process-name | 281 | (let ((R-proc (get-process (or ess-local-process-name |
| 281 | ess-current-process-name)))) | 282 | ess-current-process-name)))) |
| 282 | (while (process-get R-proc 'callbacks) | 283 | (while (process-get R-proc 'callbacks) |