tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

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

This commit is contained in:
Carsten Dominik 2010-03-31 00:16:13 +02:00
parent 28b1059f09 3637efe647
commit c1ee3cc3d9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ exported source code blocks by language."
(lang-specs (cdr (assoc lang org-babel-tangle-langs))) (lang-specs (cdr (assoc lang org-babel-tangle-langs)))
(ext (first lang-specs)) (ext (first lang-specs))
(she-bang (second lang-specs)) (she-bang (second lang-specs))
(commentable (not (third lang-specs))) (commentable (and (fboundp lang-f) (not (third lang-specs))))
she-banged) she-banged)
(mapc (mapc
(lambda (spec) (lambda (spec)
@ -122,7 +122,7 @@ exported source code blocks by language."
(delete-file file-name)) (delete-file file-name))
;; drop source-block to file ;; drop source-block to file
(with-temp-buffer (with-temp-buffer
(funcall lang-f) (if (fboundp lang-f) (funcall lang-f))
(when (and she-bang (not (member file-name she-banged))) (when (and she-bang (not (member file-name she-banged)))
(insert (concat she-bang "\n")) (insert (concat she-bang "\n"))
(setq she-banged (cons file-name she-banged))) (setq she-banged (cons file-name she-banged)))

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

@ -991,10 +991,6 @@ block but are passed literally to the \"example-block\"."
(setq new-body (concat new-body text)))) (setq new-body (concat new-body text))))
(with-temp-buffer (with-temp-buffer
(insert body) (goto-char (point-min)) (insert body) (goto-char (point-min))
(funcall (intern (concat (or (and (cdr (assoc lang org-src-lang-modes))
(symbol-name
(cdr (assoc lang org-src-lang-modes))))
lang) "-mode")))
(setq index (point)) (setq index (point))
(while (and (re-search-forward "<<\\(.+?\\)>>" nil t)) (while (and (re-search-forward "<<\\(.+?\\)>>" nil t))
(save-match-data (setf source-name (match-string 1))) (save-match-data (setf source-name (match-string 1)))