mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-26 22:02:52 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
99162353c7
|
@ -62,7 +62,8 @@
|
|||
(save-window-excursion
|
||||
(let ((processed-params (org-babel-process-params params)))
|
||||
(org-babel-reassemble-table
|
||||
(eval (read (org-babel-expand-body:emacs-lisp body params)))
|
||||
(eval (read (format "(progn %s)"
|
||||
(org-babel-expand-body:emacs-lisp body params))))
|
||||
(org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params)))
|
||||
(org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params)))))))
|
||||
|
||||
|
|
|
@ -176,6 +176,7 @@ code blocks by language."
|
|||
(source-name (intern (or (fifth info)
|
||||
(format "block-%d" block-counter))))
|
||||
(src-lang (first info))
|
||||
(expand-cmd (intern (concat "org-babel-expand-body:" src-lang)))
|
||||
(params (third info))
|
||||
by-lang)
|
||||
(unless (string= (cdr (assoc :tangle params)) "no") ;; maybe skip
|
||||
|
@ -191,7 +192,7 @@ code blocks by language."
|
|||
(if (assoc :no-expand params)
|
||||
body
|
||||
(funcall
|
||||
(intern (concat "org-babel-expand-body:" src-lang))
|
||||
(if (fboundp expand-cmd) expand-cmd 'org-babel-expand-body:generic)
|
||||
body
|
||||
params)))
|
||||
(if (and (cdr (assoc :noweb params))
|
||||
|
|
Loading…
Reference in a new issue