diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2010-08-25 19:21:42 -0600 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2010-08-25 19:21:42 -0600 |
commit | e3d271ea5b08649c43f2fbbd350c9d45d924a6ab (patch) | |
tree | f05eacd4994e1df6e8d327063879ad38471a45a1 | |
parent | 7b00073f2dd0372e9da94d8efbc472a131e32eee (diff) | |
download | org-mode-e3d271ea5b08649c43f2fbbd350c9d45d924a6ab.tar.gz |
fixed issue in org-babel-temp-file when forcing extension types
* lisp/ob-C.el (org-babel-C-execute): corrected arguments to
org-babel-temp-file
* lisp/ob-latex.el (org-babel-execute:latex): corrected arguments to
org-babel-temp-file
* lisp/ob.el (org-babel-temp-file): corrected arguments to
make-temp-file
-rw-r--r-- | lisp/ob-C.el | 9 | ||||
-rw-r--r-- | lisp/ob-latex.el | 3 | ||||
-rw-r--r-- | lisp/ob.el | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el index 01a9fb5..1892174 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -84,10 +84,11 @@ header arguments (calls `org-babel-C-expand')." "This function should only be called by `org-babel-execute:C' or `org-babel-execute:c++'." (let* ((processed-params (org-babel-process-params params)) - (tmp-src-file (org-babel-temp-file "C-src-" nil - (cond - ((equal org-babel-c-variant 'c) ".c") - ((equal org-babel-c-variant 'cpp) ".cpp")))) + (tmp-src-file (org-babel-temp-file + "C-src-" + (cond + ((equal org-babel-c-variant 'c) ".c") + ((equal org-babel-c-variant 'cpp) ".cpp")))) (tmp-bin-file (org-babel-temp-file "C-bin-")) (tmp-out-file (org-babel-temp-file "C-out-")) (cmdline (cdr (assoc :cmdline params))) diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index cb8c255..773e3b6 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -70,7 +70,7 @@ This function is called by `org-babel-execute-src-block'." (setq body (org-babel-expand-body:latex body params)) (if (cdr (assoc :file params)) (let* ((out-file (cdr (assoc :file params))) - (tex-file (org-babel-temp-file "latex-" nil ".tex")) + (tex-file (org-babel-temp-file "latex-" ".tex")) (border (cdr (assoc :border params))) (fit (or (cdr (assoc :fit params)) border)) (height (and fit (cdr (assoc :pdfheight params)))) @@ -84,6 +84,7 @@ This function is called by `org-babel-execute-src-block'." (org-create-formula-image body out-file org-format-latex-options in-buffer)) ((string-match "\\.pdf$" out-file) + (require 'org-latex) (with-temp-file tex-file (insert (org-splice-latex-header @@ -1674,7 +1674,7 @@ of `org-babel-temporary-directory'." (let ((temporary-file-directory (expand-file-name org-babel-temporary-directory temporary-file-directory))) - (make-temp-file prefix suffix))) + (make-temp-file prefix nil suffix))) (defun org-babel-remove-temporary-directory () "Remove `org-babel-temporary-directory' on Emacs shutdown." |