From 2ebc518675bb0c97f5c1b6e39d6ddacb8ee3111b Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Mon, 17 Apr 2023 20:17:55 +0200 Subject: [PATCH] * lisp/ob-R.el: Fix ESS compatibility (org-babel-R-initiate-session): Fix `require'. Do not use obsolete `R' function. --- lisp/ob-R.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 4ee091118..f2cc069aa 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -36,7 +36,7 @@ (require 'ob) (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 ess-make-buffer-current "ext:ess-inf" ()) (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) ;; Session buffer exists, but with dead process (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 ess-current-process-name)))) (while (process-get R-proc 'callbacks)