mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-13 10:10:09 +00:00
* lisp/ob-R.el: Fix ESS compatibility
(org-babel-R-initiate-session): Fix `require'. Do not use obsolete `R' function.
This commit is contained in:
parent
7d8a9324f8
commit
2ebc518675
|
@ -36,7 +36,7 @@
|
||||||
(require 'ob)
|
(require 'ob)
|
||||||
|
|
||||||
(declare-function orgtbl-to-tsv "org-table" (table params))
|
(declare-function orgtbl-to-tsv "org-table" (table params))
|
||||||
(declare-function R "ext:essd-r" (&optional start-args))
|
(declare-function run-ess-r "ext:ess-r-mode" (&optional start-args))
|
||||||
(declare-function inferior-ess-send-input "ext:ess-inf" ())
|
(declare-function inferior-ess-send-input "ext:ess-inf" ())
|
||||||
(declare-function ess-make-buffer-current "ext:ess-inf" ())
|
(declare-function ess-make-buffer-current "ext:ess-inf" ())
|
||||||
(declare-function ess-eval-buffer "ext:ess-inf" (vis))
|
(declare-function ess-eval-buffer "ext:ess-inf" (vis))
|
||||||
|
@ -276,7 +276,8 @@ This function is called by `org-babel-execute-src-block'."
|
||||||
(when (get-buffer session)
|
(when (get-buffer session)
|
||||||
;; Session buffer exists, but with dead process
|
;; Session buffer exists, but with dead process
|
||||||
(set-buffer session))
|
(set-buffer session))
|
||||||
(require 'ess) (R)
|
(require 'ess-r-mode)
|
||||||
|
(set-buffer (run-ess-r))
|
||||||
(let ((R-proc (get-process (or ess-local-process-name
|
(let ((R-proc (get-process (or ess-local-process-name
|
||||||
ess-current-process-name))))
|
ess-current-process-name))))
|
||||||
(while (process-get R-proc 'callbacks)
|
(while (process-get R-proc 'callbacks)
|
||||||
|
|
Loading…
Reference in a new issue