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

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Bastien Guerry 2010-08-04 05:54:20 +02:00
parent 43bb2e1293 f318bdb19b
commit 262fbf1e48
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob-R.el
View File

@ -230,7 +230,7 @@ return the value of the last statement in BODY, as elisp."
"FALSE"))) "FALSE")))
(org-babel-R-process-value-result (org-babel-R-process-value-result
(org-babel-import-elisp-from-file (org-babel-import-elisp-from-file
(org-babel-maybe-remote-file tmp-file)) column-names-p)))) (org-babel-maybe-remote-file tmp-file) '(16)) column-names-p))))
;; comint session evaluation ;; comint session evaluation
(case result-type (case result-type
(value (value
@ -251,7 +251,7 @@ return the value of the last statement in BODY, as elisp."
(inferior-ess-send-input)) (inferior-ess-send-input))
(org-babel-R-process-value-result (org-babel-R-process-value-result
(org-babel-import-elisp-from-file (org-babel-import-elisp-from-file
(org-babel-maybe-remote-file tmp-file)) column-names-p))) (org-babel-maybe-remote-file tmp-file) '(16)) column-names-p)))
(output (output
(mapconcat (mapconcat
#'org-babel-chomp #'org-babel-chomp

5
lisp/ob-python.el
View File

@ -125,10 +125,7 @@ Emacs-lisp table, otherwise return the results as a string."
(mapcar (lambda (el) (if (equal el 'None) 'hline el)) res) (mapcar (lambda (el) (if (equal el 'None) 'hline el)) res)
res)) res))
(org-babel-read (org-babel-read
(if (or (and (equal (substring results 0 1) "[") (if (and (stringp results) (string-match "^[([].+[])]$" results))
(equal (substring results -2 -1) "]"))
(and (equal (substring results 0 1) "(")
(equal (substring results -2 -1) ")")))
(org-babel-read (org-babel-read
(concat "'" (concat "'"
(replace-regexp-in-string (replace-regexp-in-string

4
lisp/ob.el
View File

@ -1508,7 +1508,7 @@ This is taken almost directly from `org-read-prop'."
(length string))) (length string)))
(string-to-number string))) (string-to-number string)))
(defun org-babel-import-elisp-from-file (file-name) (defun org-babel-import-elisp-from-file (file-name &optional separator)
"Read the results located at FILE-NAME into an elisp table. "Read the results located at FILE-NAME into an elisp table.
If the table is trivial, then return it as a scalar." If the table is trivial, then return it as a scalar."
(let (result) (let (result)
@ -1516,7 +1516,7 @@ If the table is trivial, then return it as a scalar."
(with-temp-buffer (with-temp-buffer
(condition-case nil (condition-case nil
(progn (progn
(org-table-import file-name nil) (org-table-import file-name separator)
(delete-file file-name) (delete-file file-name)
(setq result (mapcar (lambda (row) (setq result (mapcar (lambda (row)
(mapcar #'org-babel-string-read row)) (mapcar #'org-babel-string-read row))