mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes from Org 7.4 to current Org 7.7.

Browse source
This commit is contained in:
Bastien Guerry 2011-07-28 17:13:49 +02:00
parent 44a8054f97
commit 3ab2c837b3
104 changed files with 18444 additions and 6673 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/org/ob-haskell.el
View file

@ -1,11 +1,11 @@
;;; ob-haskell.el --- org-babel functions for haskell evaluation
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.4
;; Version: 7.7
;; This file is part of GNU Emacs.
@ -51,6 +51,7 @@
(declare-function inferior-haskell-load-file
"ext:inf-haskell" (&optional reload))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("haskell" . "hs"))
(defvar org-babel-default-header-args:haskell '())
@ -191,7 +192,7 @@ constructs (header arguments, no-web syntax etc...) are ignored."
(save-excursion
;; export to latex w/org and save as .lhs
(find-file tmp-org-file) (funcall 'org-export-as-latex nil)
(kill-buffer)
(kill-buffer nil)
(delete-file tmp-org-file)
(find-file tmp-tex-file)
(goto-char (point-min)) (forward-line 2)
@ -201,7 +202,7 @@ constructs (header arguments, no-web syntax etc...) are ignored."
(replace-match (save-match-data (org-remove-indentation (match-string 0)))
t t))
(setq contents (buffer-string))
(save-buffer) (kill-buffer))
(save-buffer) (kill-buffer nil))
(delete-file tmp-tex-file)
;; save org exported latex to a .lhs file
(with-temp-file lhs-file (insert contents))
@ -212,5 +213,6 @@ constructs (header arguments, no-web syntax etc...) are ignored."
(provide 'ob-haskell)
;; arch-tag: b53f75f3-ba1a-4b05-82d9-a2a0d4e70804
;;; ob-haskell.el ends here