mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Sync with Org 8.2.8.

Browse source
This commit is contained in:
Bastien Guerry 2014-10-03 10:13:51 +02:00
parent e197284d47
commit a81e5de3a3
44 changed files with 2586 additions and 1811 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/org/ob-core.el
View file

@ -38,6 +38,7 @@
(defvar org-src-lang-modes)
(defvar org-babel-library-of-babel)
(declare-function show-all "outline" ())
(declare-function org-every "org" (pred seq))
(declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
(declare-function org-mark-ring-push "org" (&optional pos buffer))
(declare-function tramp-compat-make-temp-file "tramp-compat"
@ -1348,7 +1349,7 @@ specified in the properties of the current outline entry."
(org-entry-get org-babel-current-src-block-location
(concat "header-args:" lang) 'inherit))))))
(defvar org-src-preserve-indentation)
(defvar org-src-preserve-indentation) ;; declare defcustom from org-src
(defun org-babel-parse-src-block-match ()
"Parse the results from a match of the `org-babel-src-block-regexp'."
(let* ((block-indentation (length (match-string 1)))
@ -2100,9 +2101,9 @@ code ---- the results are extracted in the syntax of the source
((funcall proper-list-p result)
(goto-char beg)
(insert (concat (orgtbl-to-orgtbl
(if (or (eq 'hline (car result))
(and (listp (car result))
(listp (cdr (car result)))))
(if (org-every
(lambda (el) (or (listp el) (eq el 'hline)))
result)
result (list result))
'(:fmt (lambda (cell) (format "%s" cell)))) "\n"))
(goto-char beg) (when (org-at-table-p) (org-table-align)))