Sync `org-babel-temp-file' definition with maint

This commit is contained in:
Bastien Guerry 2012-12-23 17:47:20 +01:00
parent 953b920c9b
commit ae7516b0e1
1 changed files with 5 additions and 9 deletions

View File

@ -2585,18 +2585,14 @@ Emacs shutdown."))
Passes PREFIX and SUFFIX directly to `make-temp-file' with the
value of `temporary-file-directory' temporarily set to the value
of `org-babel-temporary-directory'."
(if (file-remote-p default-directory)
(make-temp-file
(concat (file-remote-p default-directory)
(expand-file-name
prefix temporary-file-directory)
nil suffix))
(let ((temporary-file-directory
(let ((temporary-file-directory
(if (file-remote-p default-directory)
(concat (file-remote-p default-directory) "/tmp")
(or (and (boundp 'org-babel-temporary-directory)
(file-exists-p org-babel-temporary-directory)
org-babel-temporary-directory)
temporary-file-directory)))
(make-temp-file prefix nil suffix))))
temporary-file-directory))))
(make-temp-file prefix nil suffix)))
(defun org-babel-remove-temporary-directory ()
"Remove `org-babel-temporary-directory' on Emacs shutdown."