mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 21:37:50 +00:00
Code Releases Activity

Bug fix: I was missing out org-babel-table-or-string with external

Browse source 
process evaluation (non-session).

Also, I have renamed org-babel-table-or-results to org-babel-table-or-string.
This commit is contained in:
Dan Davison 2009-07-05 19:55:54 -04:00
parent ad6eaadd39
commit e45cf15b06
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/langs/org-babel-python.el
View file

@ -79,7 +79,7 @@ specifying a var of the same value."
(concat "[" (mapconcat #'org-babel-python-var-to-python var ", ") "]")
(format "%S" var)))
(defun org-babel-python-table-or-results (results)
(defun org-babel-python-table-or-string (results)
"If the results look like a table, then convert them into an
Emacs-lisp table, otherwise return the results as a string."
(org-babel-read
@ -153,7 +153,8 @@ last statement in BODY."
tmp-file))
;; (message "buffer=%s" (buffer-string)) ;; debugging
(shell-command-on-region (point-min) (point-max) "python"))
(with-temp-buffer (insert-file-contents tmp-file) (buffer-string))))))
(org-babel-python-table-or-string
(with-temp-buffer (insert-file-contents tmp-file) (buffer-string)))))))
;; comint session evaluation
(org-babel-comint-in-buffer buffer
(let* ((full-body
@ -170,7 +171,7 @@ last statement in BODY."
(setq results (mapcar #'org-babel-python-read-string results))
(case result-type
(output (org-babel-trim (mapconcat #'identity (reverse (cdr results)) "\n")))
(value (org-babel-python-table-or-results (org-babel-trim (car results)))))))))
(value (org-babel-python-table-or-string (org-babel-trim (car results)))))))))
(defun org-babel-python-read-string (string)
"Strip 's from around ruby string"