mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

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

This commit is contained in:
Carsten Dominik 2009-11-02 22:12:51 +01:00
parent cfcc99c789 f01fb927e1
commit 4523ae580b
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/babel/lisp/org-babel.el
View File

@ -503,21 +503,23 @@ line. If no result exists for this block then create a
(defun org-babel-read-result ()
"Read the result at `point' into emacs-lisp."
(cond
((org-at-table-p) (org-babel-read-table))
((looking-at ": ")
(let ((result-string
(org-babel-trim
(mapconcat (lambda (line) (if (and (> (length line) 1)
(string= ": " (substring line 0 2)))
(substring line 2)
line))
(split-string
(buffer-substring (point) (org-babel-result-end)) "[\r\n]+")
"\n"))))
(or (org-babel-number-p result-string) result-string)))
((looking-at "^#\\+RESNAME:")
(save-excursion (forward-line 1) (org-babel-read-result)))))
(let ((case-fold-search t) result-string)
(cond
((org-at-table-p) (org-babel-read-table))
((looking-at org-block-regexp) (org-babel-trim (match-string 4)))
((looking-at ": ")
(setq result-string
(org-babel-trim
(mapconcat (lambda (line) (if (and (> (length line) 1)
(string= ": " (substring line 0 2)))
(substring line 2)
line))
(split-string
(buffer-substring (point) (org-babel-result-end)) "[\r\n]+")
"\n")))
(or (org-babel-number-p result-string) result-string))
((looking-at "^#\\+RESNAME:")
(save-excursion (forward-line 1) (org-babel-read-result))))))
(defun org-babel-read-table ()
"Read the table at `point' into emacs-lisp."