forked from mirrors/org-mode
ob: enforce "verbatim" as synonym for "scalar"
* lisp/ob-awk.el (org-babel-execute:awk): Use "verbatim" as synonym for "scalar". * lisp/ob-sh.el (org-babel-sh-evaluate): Use "verbatim" as synonym for "scalar". * lisp/ob-sqlite.el (org-babel-execute:sqlite): Use "verbatim" as synonym for "scalar". * lisp/ob.el (org-babel-merge-params): Use "verbatim" as synonym for "scalar".
This commit is contained in:
parent
cef17b6340
commit
c6e69cd85b
|
@ -82,6 +82,7 @@ called by `org-babel-execute-src-block'"
|
||||||
((lambda (results)
|
((lambda (results)
|
||||||
(when results
|
(when results
|
||||||
(if (or (member "scalar" result-params)
|
(if (or (member "scalar" result-params)
|
||||||
|
(member "verbatim" result-params)
|
||||||
(member "output" result-params))
|
(member "output" result-params))
|
||||||
results
|
results
|
||||||
(let ((tmp (org-babel-temp-file "awk-results-")))
|
(let ((tmp (org-babel-temp-file "awk-results-")))
|
||||||
|
|
|
@ -143,6 +143,7 @@ return the value of the last statement in BODY."
|
||||||
((lambda (results)
|
((lambda (results)
|
||||||
(when results
|
(when results
|
||||||
(if (or (member "scalar" result-params)
|
(if (or (member "scalar" result-params)
|
||||||
|
(member "verbatim" result-params)
|
||||||
(member "output" result-params))
|
(member "output" result-params))
|
||||||
results
|
results
|
||||||
(let ((tmp-file (org-babel-temp-file "sh-")))
|
(let ((tmp-file (org-babel-temp-file "sh-")))
|
||||||
|
|
|
@ -89,6 +89,7 @@ This function is called by `org-babel-execute-src-block'."
|
||||||
;; body of the code block
|
;; body of the code block
|
||||||
(org-babel-expand-body:sqlite body params)))
|
(org-babel-expand-body:sqlite body params)))
|
||||||
(if (or (member "scalar" result-params)
|
(if (or (member "scalar" result-params)
|
||||||
|
(member "verbatim" result-params)
|
||||||
(member "html" result-params)
|
(member "html" result-params)
|
||||||
(member "code" result-params)
|
(member "code" result-params)
|
||||||
(equal (point-min) (point-max)))
|
(equal (point-min) (point-max)))
|
||||||
|
|
|
@ -1723,7 +1723,7 @@ Later elements of PLISTS override the values of previous elements.
|
||||||
This takes into account some special considerations for certain
|
This takes into account some special considerations for certain
|
||||||
parameters when merging lists."
|
parameters when merging lists."
|
||||||
(let ((results-exclusive-groups
|
(let ((results-exclusive-groups
|
||||||
'(("file" "list" "vector" "table" "scalar" "raw" "org"
|
'(("file" "list" "vector" "table" "scalar" "verbatim" "raw" "org"
|
||||||
"html" "latex" "code" "pp" "wrap")
|
"html" "latex" "code" "pp" "wrap")
|
||||||
("replace" "silent" "append" "prepend")
|
("replace" "silent" "append" "prepend")
|
||||||
("output" "value")))
|
("output" "value")))
|
||||||
|
|
Loading…
Reference in a new issue