tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

lisp/ob-lisp: fix `org-babel-execute:lisp' for use with Sly 

* lisp/ob-lisp (org-babel-execute:lisp): by default, Sly and Slime
talk with different RPC server programs with different names.
Specialize the prefix of eval-and-grab-output to Slime (prefix swank:)
or to Sly (prefix slynk:).
This commit is contained in:
Gerard Vermeulen 2023-03-29 09:21:08 +02:00 committed by Ihor Radchenko
parent 9ea50ca211
commit e58bbded5c
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lisp/ob-lisp.el
View File

@ -90,35 +90,38 @@ current directory string."
"Execute a block of Common Lisp code with Babel. "Execute a block of Common Lisp code with Babel.
BODY is the contents of the block, as a string. PARAMS is BODY is the contents of the block, as a string. PARAMS is
a property list containing the parameters of the block." a property list containing the parameters of the block."
(pcase org-babel-lisp-eval-fn (let (eval-and-grab-output)
(`slime-eval (org-require-package 'slime "SLIME")) (pcase org-babel-lisp-eval-fn
(`sly-eval (org-require-package 'sly "SLY"))) (`slime-eval (org-require-package 'slime "SLIME")
(org-babel-reassemble-table (setq eval-and-grab-output 'swank:eval-and-grab-output))
(let ((result (`sly-eval (org-require-package 'sly "SLY")
(funcall (if (member "output" (cdr (assq :result-params params))) (setq eval-and-grab-output 'slynk:eval-and-grab-output)))
#'car #'cadr) (org-babel-reassemble-table
(with-temp-buffer (let ((result
(insert (org-babel-expand-body:lisp body params)) (funcall (if (member "output" (cdr (assq :result-params params)))
(funcall org-babel-lisp-eval-fn #'car #'cadr)
`(swank:eval-and-grab-output (with-temp-buffer
,(let ((dir (if (assq :dir params) (insert (org-babel-expand-body:lisp body params))
(cdr (assq :dir params)) (funcall org-babel-lisp-eval-fn
default-directory))) `(,eval-and-grab-output
(format ,(let ((dir (if (assq :dir params)
(if dir (format org-babel-lisp-dir-fmt dir) (cdr (assq :dir params))
"(progn %s\n)") default-directory)))
(buffer-substring-no-properties (format
(point-min) (point-max))))) (if dir (format org-babel-lisp-dir-fmt dir)
(cdr (assq :package params))))))) "(progn %s\n)")
(org-babel-result-cond (cdr (assq :result-params params)) (buffer-substring-no-properties
(org-strip-quotes result) (point-min) (point-max)))))
(condition-case nil (cdr (assq :package params)))))))
(read (org-babel-lisp-vector-to-list result)) (org-babel-result-cond (cdr (assq :result-params params))
(error result)))) (org-strip-quotes result)
(org-babel-pick-name (cdr (assq :colname-names params)) (condition-case nil
(cdr (assq :colnames params))) (read (org-babel-lisp-vector-to-list result))
(org-babel-pick-name (cdr (assq :rowname-names params)) (error result))))
(cdr (assq :rownames params))))) (org-babel-pick-name (cdr (assq :colname-names params))
(cdr (assq :colnames params)))
(org-babel-pick-name (cdr (assq :rowname-names params))
(cdr (assq :rownames params))))))
(defun org-babel-lisp-vector-to-list (results) (defun org-babel-lisp-vector-to-list (results)
;; TODO: better would be to replace #(...) with [...] ;; TODO: better would be to replace #(...) with [...]