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 2009-10-08 08:46:20 +02:00
parent d5821a91ba c0d54a9a6b
commit a26640ef26
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,6 +174,10 @@ constructs (header arguments, no-web syntax etc...) are ignored."
(find-file tmp-tex-file) (find-file tmp-tex-file)
(goto-char (point-min)) (forward-line 2) (goto-char (point-min)) (forward-line 2)
(insert "%include polycode.fmt\n") (insert "%include polycode.fmt\n")
;; ensure all \begin/end{code} statements start at the first column
(while (re-search-forward "^[ \t]+\\\\begin{code}[^\000]+\\\\end{code}" nil t)
(replace-match (save-match-data (org-remove-indentation (match-string 0)))
t t))
(setq contents (buffer-string)) (setq contents (buffer-string))
(save-buffer) (kill-buffer)) (save-buffer) (kill-buffer))
(delete-file tmp-tex-file) (delete-file tmp-tex-file)

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

@ -361,7 +361,7 @@ may be specified in the properties of the current outline entry."
(when val (when val
;; (message "param-from-property %s=%s" header-arg val) ;; debugging statement ;; (message "param-from-property %s=%s" header-arg val) ;; debugging statement
(cons (intern (concat ":" header-arg)) val)))) (cons (intern (concat ":" header-arg)) val))))
'("results" "exports" "tangle" "var"))))) '("exports" "results" "session" "tangle" "var")))))
(defun org-babel-parse-src-block-match () (defun org-babel-parse-src-block-match ()
(let* ((lang (org-babel-clean-text-properties (match-string 1))) (let* ((lang (org-babel-clean-text-properties (match-string 1)))