diff options
author | Dan Davison <davison@stats.ox.ac.uk> | 2009-07-05 21:57:42 -0400 |
---|---|---|
committer | Dan Davison <davison@stats.ox.ac.uk> | 2009-07-05 21:57:42 -0400 |
commit | 6143bb7aad5872effd16f7889db26d7c303d402f (patch) | |
tree | c96483df294624bdb6308283471fce763cc3318d | |
parent | f7ea8ccb2e48691c22d9544c77108f8beb33ce71 (diff) | |
download | org-mode-6143bb7aad5872effd16f7889db26d7c303d402f.tar.gz |
Streamlining/fiddling with org-babel-execute-src-block.
This includes an explicit implementation of the idea that no result is
returned in the case of :results output.
-rw-r--r-- | lisp/org-babel.el | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/org-babel.el b/lisp/org-babel.el index c1c37a1..6491449 100644 --- a/lisp/org-babel.el +++ b/lisp/org-babel.el @@ -160,21 +160,20 @@ the header arguments specified at the source code block." ((member "value" result-params) 'value) (t 'value))) (cmd (intern (concat "org-babel-execute:" lang))) - result) - (message (format "params=%S" params)) ;; debugging + result) + ;; (message (format "params=%S" params)) ;; debugging (unless (member lang org-babel-interpreters) (error "Language is not in `org-babel-interpreters': %s" lang)) + (when arg (setq result-params (cons "silent" result-params))) (setq result (org-babel-process-result (funcall cmd body params) result-type)) - (if arg - (message (replace-regexp-in-string "%" "%%" (format "%S" result))) - (org-babel-insert-result result (cdr (assoc :results params)))) - result)) + (org-babel-insert-result result result-params) + (case result-type (output nil) (value result)))) (defun org-babel-process-result (result result-type) "This doesn't do anything currently. You can see below the various fragments of results-processing - code that where present in the language-specific files. Out of + code that were present in the language-specific files. Out of those fragments, I've moved the org-babel-python-table-or-results and org-babel-import-elisp-from-file functionality into the @@ -399,7 +398,6 @@ replace - insert results after the source block replacing any previously inserted results silent -- no results are inserted" - (if insert (setq insert (split-string insert))) (if (stringp result) (progn (setq result (org-babel-clean-text-properties result)) |