mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-26 06:32:53 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
4523ae580b
|
@ -503,10 +503,12 @@ line. If no result exists for this block then create a
|
||||||
|
|
||||||
(defun org-babel-read-result ()
|
(defun org-babel-read-result ()
|
||||||
"Read the result at `point' into emacs-lisp."
|
"Read the result at `point' into emacs-lisp."
|
||||||
|
(let ((case-fold-search t) result-string)
|
||||||
(cond
|
(cond
|
||||||
((org-at-table-p) (org-babel-read-table))
|
((org-at-table-p) (org-babel-read-table))
|
||||||
|
((looking-at org-block-regexp) (org-babel-trim (match-string 4)))
|
||||||
((looking-at ": ")
|
((looking-at ": ")
|
||||||
(let ((result-string
|
(setq result-string
|
||||||
(org-babel-trim
|
(org-babel-trim
|
||||||
(mapconcat (lambda (line) (if (and (> (length line) 1)
|
(mapconcat (lambda (line) (if (and (> (length line) 1)
|
||||||
(string= ": " (substring line 0 2)))
|
(string= ": " (substring line 0 2)))
|
||||||
|
@ -514,10 +516,10 @@ line. If no result exists for this block then create a
|
||||||
line))
|
line))
|
||||||
(split-string
|
(split-string
|
||||||
(buffer-substring (point) (org-babel-result-end)) "[\r\n]+")
|
(buffer-substring (point) (org-babel-result-end)) "[\r\n]+")
|
||||||
"\n"))))
|
"\n")))
|
||||||
(or (org-babel-number-p result-string) result-string)))
|
(or (org-babel-number-p result-string) result-string))
|
||||||
((looking-at "^#\\+RESNAME:")
|
((looking-at "^#\\+RESNAME:")
|
||||||
(save-excursion (forward-line 1) (org-babel-read-result)))))
|
(save-excursion (forward-line 1) (org-babel-read-result))))))
|
||||||
|
|
||||||
(defun org-babel-read-table ()
|
(defun org-babel-read-table ()
|
||||||
"Read the table at `point' into emacs-lisp."
|
"Read the table at `point' into emacs-lisp."
|
||||||
|
|
Loading…
Reference in a new issue