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:
Carsten Dominik 2010-04-28 08:49:55 +02:00
parent ce6caec446 6a1f5b2bcb
commit 99162353c7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/babel/lisp/langs/org-babel-emacs-lisp.el
View File

@ -62,7 +62,8 @@
(save-window-excursion (save-window-excursion
(let ((processed-params (org-babel-process-params params))) (let ((processed-params (org-babel-process-params params)))
(org-babel-reassemble-table (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 4 processed-params) (cdr (assoc :colnames params)))
(org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params))))))) (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params)))))))

3
contrib/babel/lisp/org-babel-tangle.el
View File

@ -176,6 +176,7 @@ code blocks by language."
(source-name (intern (or (fifth info) (source-name (intern (or (fifth info)
(format "block-%d" block-counter)))) (format "block-%d" block-counter))))
(src-lang (first info)) (src-lang (first info))
(expand-cmd (intern (concat "org-babel-expand-body:" src-lang)))
(params (third info)) (params (third info))
by-lang) by-lang)
(unless (string= (cdr (assoc :tangle params)) "no") ;; maybe skip (unless (string= (cdr (assoc :tangle params)) "no") ;; maybe skip
@ -191,7 +192,7 @@ code blocks by language."
(if (assoc :no-expand params) (if (assoc :no-expand params)
body body
(funcall (funcall
(intern (concat "org-babel-expand-body:" src-lang)) (if (fboundp expand-cmd) expand-cmd 'org-babel-expand-body:generic)
body body
params))) params)))
(if (and (cdr (assoc :noweb params)) (if (and (cdr (assoc :noweb params))