diff options
| author | Bastien <bzg@gnu.org> | 2019-12-03 23:27:04 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2019-12-03 23:27:04 +0100 |
| commit | 165f7383822086d465519ebe6e4283723923f097 (patch) | |
| tree | 820be9480e3d571d766483f564c963037192f6ec /lisp/org/ob-lua.el | |
| parent | 821de968434d2096bdea67dd24301bf6b517aef1 (diff) | |
| download | emacs-165f7383822086d465519ebe6e4283723923f097.tar.gz emacs-165f7383822086d465519ebe6e4283723923f097.tar.bz2 emacs-165f7383822086d465519ebe6e4283723923f097.zip | |
Update Org to 9.3
Diffstat (limited to 'lisp/org/ob-lua.el')
| -rw-r--r-- | lisp/org/ob-lua.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/org/ob-lua.el b/lisp/org/ob-lua.el index 8712619ecc6..530376a41d3 100644 --- a/lisp/org/ob-lua.el +++ b/lisp/org/ob-lua.el @@ -34,10 +34,9 @@ ;;; Code: (require 'ob) +(require 'org-macs) (require 'cl-lib) -(declare-function org-remove-indentation "org" (code &optional n)) -(declare-function org-trim "org" (s &optional keep-lead)) (declare-function lua-shell "ext:lua-mode" (&optional argprompt)) (declare-function lua-toggle-shells "ext:lua-mode" (arg)) (declare-function run-lua "ext:lua" (cmd &optional dedicated show)) @@ -149,7 +148,7 @@ specifying a variable of the same value." (if (eq var 'hline) org-babel-lua-hline-to (format - (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") + (if (and (stringp var) (string-match "[\n\r]" var)) "[=[%s]=]" "%S") (if (stringp var) (substring-no-properties var) var))))) (defun org-babel-lua-table-or-string (results) @@ -291,13 +290,13 @@ last statement in BODY, as elisp." (let ((raw (pcase result-type (`output (org-babel-eval org-babel-lua-command - (concat (if preamble (concat preamble "\n")) + (concat preamble (and preamble "\n") body))) (`value (let ((tmp-file (org-babel-temp-file "lua-"))) (org-babel-eval org-babel-lua-command (concat - (if preamble (concat preamble "\n") "") + preamble (and preamble "\n") (format (if (member "pp" result-params) org-babel-lua-pp-wrapper-method |