diff options
| author | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
|---|---|---|
| committer | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
| commit | 716d676747119f9950861f9a64a8e7871b0082d4 (patch) | |
| tree | b71f94b50896736a007d6977c97679e1abd895a6 /lisp/org/ob-core.el | |
| parent | 54ec3973e298c3d2b3d81484f80053d881694f88 (diff) | |
| parent | 7493b4026fc74a51c76c5b614bc83b864af9bc31 (diff) | |
| download | emacs-scratch/pkg.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/pkgscratch/pkg
Diffstat (limited to 'lisp/org/ob-core.el')
| -rw-r--r-- | lisp/org/ob-core.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index f69538f78c9..c2a3673752e 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -2464,7 +2464,11 @@ INFO may provide the values of these header arguments (in the (cons 'unordered (mapcar (lambda (e) - (list (if (stringp e) e (format "%S" e)))) + (cond + ((stringp e) (list e)) + ((listp e) + (mapcar (lambda (x) (format "%S" x)) e)) + (t (list (format "%S" e))))) (if (listp result) result (split-string result "\n" t)))) '(:splicep nil :istart "- " :iend "\n"))) @@ -3183,8 +3187,8 @@ situations in which is it not appropriate." (if (and (memq (string-to-char cell) '(?\( ?`)) (not (org-babel-confirm-evaluate ;; See `org-babel-get-src-block-info'. - (list "emacs-lisp" (format "%S" cell) - '((:eval . yes)) nil (format "%S" cell) + (list "emacs-lisp" cell + '((:eval . yes)) nil (format "%s" cell) nil nil)))) ;; Not allowed. (user-error "Evaluation of elisp code %S aborted." cell) |