ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new :results behavior

This commit is contained in:
Dan Davison 2010-12-20 16:44:24 +00:00
parent 5f77fd6a81
commit a871c6a77c
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lisp/ob.el
View File

@ -405,17 +405,23 @@ block."
(if (nth 4 info) (format " (%s)" (nth 4 info)) "")) (if (nth 4 info) (format " (%s)" (nth 4 info)) ""))
(setq result (setq result
((lambda (result) ((lambda (result)
(cond (if (and (eq (cdr (assoc :result-type params)) 'value)
((member "file" result-params) (or (member "vector" result-params)
(or (cdr (assoc :file params)) (member "table" result-params))
(if (stringp result) result))) (not (listp result)))
((and (eq (cdr (assoc :result-type params)) 'value) (list (list result)) result))
(or (member "vector" result-params)
(member "table" result-params))
(not (listp result)))
(list (list result)))
(t result)))
(funcall cmd body params))) (funcall cmd body params)))
;; if non-empty result and :file then write to :file
(flet ((echo-res (result)
(if (stringp result) result (format "%S" result))))
(when (cdr (assoc :file params))
(when result
(with-temp-file (cdr (assoc :file params))
(if (stringp result)
(insert result)
(insert (orgtbl-to-generic
result '(:sep "\t" :fmt echo-res))))))
(setq result (cdr (assoc :file params)))))
(org-babel-insert-result (org-babel-insert-result
result result-params info new-hash indent lang) result result-params info new-hash indent lang)
(run-hooks 'org-babel-after-execute-hook) (run-hooks 'org-babel-after-execute-hook)
@ -1538,15 +1544,19 @@ code ---- the results are extracted in the syntax of the source
"Convert RESULT into an `org-mode' link. "Convert RESULT into an `org-mode' link.
If the `default-directory' is different from the containing If the `default-directory' is different from the containing
file's directory then expand relative links." file's directory then expand relative links."
(format (flet ((cond-exp (file)
"[[file:%s]]" (if (and default-directory
(if (and default-directory buffer-file-name
buffer-file-name (not (string= (expand-file-name default-directory)
(not (string= (expand-file-name default-directory) (expand-file-name
(expand-file-name (file-name-directory buffer-file-name)))))
(file-name-directory buffer-file-name))))) (expand-file-name file default-directory)
(expand-file-name result default-directory) file)))
result))) (if (stringp result)
(format "[[file:%s]]" (cond-exp result))
(when (and (listp result) (= 2 (length result))
(stringp (car result)) (stringp (cadr result)))
(format "[[file:%s][%s]]" (car result) (cadr result))))))
(defun org-babel-examplize-region (beg end &optional results-switches) (defun org-babel-examplize-region (beg end &optional results-switches)
"Comment out region using the ': ' org example quote." "Comment out region using the ': ' org example quote."