branch: externals/org
commit 5cfc857c66e3ad7d4b70bb4a61f641c059994170
Author: Owen Radcliffe <garlic...@gmail.com>
Commit: Ihor Radchenko <yanta...@posteo.net>
ob-lisp: Prefix cl: symbols explicitly
* lisp/ob-lisp.el (org-babel-lisp-dir-fmt):
(org-babel-expand-body:lisp):
(org-babel-execute:lisp): Use explicit cl: prefix for wrapper code so
that ob-lisp.el can be used without being in a package that uses :cl.
Link:
https://orgmode.org/list/caj87nk_d7edoaursu2pj00vngcj8vhak1jkvke2bqgogjp+...@mail.gmail.com
TINYCHANGE
---
lisp/ob-lisp.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index ed5a4bb004..66e5373074 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -61,7 +61,7 @@ Valid values include `slime-eval' and `sly-eval'."
:type 'symbol)
(defcustom org-babel-lisp-dir-fmt
- "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)"
+ "(cl:let ((cl:*default-pathname-defaults* #P%S\n)) %%s\n)"
"Format string used to wrap code bodies to set the current directory.
For example a value of \"(progn ;; %s\\n %%s)\" would ignore the
current directory string."
@@ -77,10 +77,10 @@ current directory string."
(prologue (cdr (assq :prologue params)))
(epilogue (cdr (assq :epilogue params)))
(body (if (null vars) (org-trim body)
- (concat "(let ("
+ (concat "(cl:let ("
(mapconcat
(lambda (var)
- (format "(%S (quote %S))" (car var) (cdr var)))
+ (format "(%S (cl:quote %S))" (car var) (cdr var)))
vars "\n ")
")\n"
(and prologue (concat prologue "\n"))
@@ -89,7 +89,7 @@ current directory string."
")"))))
(if (or (member "code" result-params)
(member "pp" result-params))
- (format "(pprint %s)" body)
+ (format "(cl:pprint %s)" body)
body)))
(defun org-babel-execute:lisp (body params)
@@ -115,7 +115,7 @@ a property list containing the parameters of the block."
default-directory)))
(format
(if dir (format org-babel-lisp-dir-fmt
dir)
- "(progn %s\n)")
+ "(cl:progn %s\n)")
(buffer-substring-no-properties
(point-min) (point-max)))))
(cdr (assq :package params)))))))
