mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 23:17:49 +00:00
Backport commit 844e82f5a from Emacs
* lisp/ob-ruby.el (org-babel-ruby-initiate-session): Use :ruby header arg. (org-babel-execute:ruby): Call org-babel-ruby-initiate-session with `params'. (org-babel-ruby-command): Mention :ruby header argument. * lisp/org/ob-ruby.el (org-babel-ruby-initiate-session): Use :ruby header arg. 844e82f5a837a16c64e32ff9dd41a9e9b3ad3432 Juri Linkov Sat Nov 14 22:18:38 2020 +0200
This commit is contained in:
parent
23896ba683
commit
9bb93006ea
|
@ -51,7 +51,8 @@
|
|||
(defvar org-babel-default-header-args:ruby '())
|
||||
|
||||
(defvar org-babel-ruby-command "ruby"
|
||||
"Name of command to use for executing ruby code.")
|
||||
"Name of command to use for executing ruby code.
|
||||
It's possible to override it by using a header argument `:ruby'")
|
||||
|
||||
(defcustom org-babel-ruby-hline-to "nil"
|
||||
"Replace hlines in incoming tables with this when translating to ruby."
|
||||
|
@ -71,7 +72,7 @@
|
|||
"Execute a block of Ruby code with Babel.
|
||||
This function is called by `org-babel-execute-src-block'."
|
||||
(let* ((session (org-babel-ruby-initiate-session
|
||||
(cdr (assq :session params))))
|
||||
(cdr (assq :session params)) params))
|
||||
(result-params (cdr (assq :result-params params)))
|
||||
(result-type (cdr (assq :result-type params)))
|
||||
(org-babel-ruby-command
|
||||
|
@ -151,14 +152,15 @@ Emacs-lisp table, otherwise return the results as a string."
|
|||
res)
|
||||
res)))
|
||||
|
||||
(defun org-babel-ruby-initiate-session (&optional session _params)
|
||||
(defun org-babel-ruby-initiate-session (&optional session params)
|
||||
"Initiate a ruby session.
|
||||
If there is not a current inferior-process-buffer in SESSION
|
||||
then create one. Return the initialized session."
|
||||
(unless (string= session "none")
|
||||
(require 'inf-ruby)
|
||||
(let* ((cmd (cdr (assoc inf-ruby-default-implementation
|
||||
inf-ruby-implementations)))
|
||||
(let* ((cmd (cdr (or (assq :ruby params)
|
||||
(assoc inf-ruby-default-implementation
|
||||
inf-ruby-implementations))))
|
||||
(buffer (get-buffer (format "*%s*" session)))
|
||||
(session-buffer (or buffer (save-window-excursion
|
||||
(run-ruby cmd session)
|
||||
|
|
Loading…
Reference in a new issue