summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2014-09-18 21:56:53 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2014-09-18 21:56:53 +0200
commite5f61642a3537e531e023cd9e0c729486c40c6af (patch)
tree5de83d2ecca1258d9770d63a434304860033091f
parent0fd29a5ee7d14c3695b22998196373b9a3637413 (diff)
downloadorg-mode-e5f61642a3537e531e023cd9e0c729486c40c6af.tar.gz
ob-R: make it work with older ESS versions
* lisp/ob-R.el (org-babel-R-initiate-session): The PROC argument is mandatory for older ESS versions.
-rw-r--r--lisp/ob-R.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 98123af..d7ee397 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -36,7 +36,7 @@
(declare-function ess-make-buffer-current "ext:ess-inf" ())
(declare-function ess-eval-buffer "ext:ess-inf" (vis))
(declare-function ess-wait-for-process "ext:ess-inf"
- (&optional proc sec-prompt wait force-redisplay))
+ (proc &optional sec-prompt wait force-redisplay))
(declare-function org-number-sequence "org-compat" (from &optional to inc))
(declare-function org-remove-if-not "org" (predicate seq))
(declare-function org-every "org" (pred seq))
@@ -264,7 +264,9 @@ This function is called by `org-babel-execute-src-block'."
;; Session buffer exists, but with dead process
(set-buffer session))
(require 'ess) (R)
- (ess-wait-for-process)
+ (ess-wait-for-process
+ (get-process (or ess-local-process-name
+ ess-current-process-name)))
(rename-buffer
(if (bufferp session)
(buffer-name session)