diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-12-23 17:47:20 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-12-23 17:47:20 +0100 |
| commit | ae7516b0e1a98b2c3a2d2d88b38e91e8e01926e1 (patch) | |
| tree | 7ad438cec8c154c9add9be3766f6be3a61e56188 | |
| parent | 953b920c9bd1af1f8867146c89ce1e1c12e093c6 (diff) | |
| download | org-mode-ae7516b0e1a98b2c3a2d2d88b38e91e8e01926e1.tar.gz | |
Sync `org-babel-temp-file' definition with maint
| -rw-r--r-- | lisp/ob-core.el | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 9d62ae8..9e4c8b1 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -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." |