diff options
| author | Eric Schulte <schulte.eric@gmail.com> | 2011-07-10 09:34:28 -0600 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2011-07-10 09:42:54 -0600 |
| commit | c6e69cd85b0f838a851e0f28cc2bc8e73722298d (patch) | |
| tree | 573a90f10f0f5df1ba71ba1ef83fa884f826e1b1 | |
| parent | cef17b6340213301a1b4b400417dd76625eccb50 (diff) | |
| download | org-mode-c6e69cd85b0f838a851e0f28cc2bc8e73722298d.tar.gz | |
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".
| -rw-r--r-- | lisp/ob-awk.el | 1 | ||||
| -rw-r--r-- | lisp/ob-sh.el | 1 | ||||
| -rw-r--r-- | lisp/ob-sqlite.el | 1 | ||||
| -rw-r--r-- | lisp/ob.el | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el index a6ec10c..d5098bc 100644 --- a/lisp/ob-awk.el +++ b/lisp/ob-awk.el @@ -82,6 +82,7 @@ called by `org-babel-execute-src-block'" ((lambda (results) (when results (if (or (member "scalar" result-params) + (member "verbatim" result-params) (member "output" result-params)) results (let ((tmp (org-babel-temp-file "awk-results-"))) diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el index 10c606f..6da1d02 100644 --- a/lisp/ob-sh.el +++ b/lisp/ob-sh.el @@ -143,6 +143,7 @@ return the value of the last statement in BODY." ((lambda (results) (when results (if (or (member "scalar" result-params) + (member "verbatim" result-params) (member "output" result-params)) results (let ((tmp-file (org-babel-temp-file "sh-"))) diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el index e1444cd..26c59c2 100644 --- a/lisp/ob-sqlite.el +++ b/lisp/ob-sqlite.el @@ -89,6 +89,7 @@ This function is called by `org-babel-execute-src-block'." ;; body of the code block (org-babel-expand-body:sqlite body params))) (if (or (member "scalar" result-params) + (member "verbatim" result-params) (member "html" result-params) (member "code" result-params) (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 parameters when merging lists." (let ((results-exclusive-groups - '(("file" "list" "vector" "table" "scalar" "raw" "org" + '(("file" "list" "vector" "table" "scalar" "verbatim" "raw" "org" "html" "latex" "code" "pp" "wrap") ("replace" "silent" "append" "prepend") ("output" "value"))) |