summaryrefslogtreecommitdiff
path: root/lisp/org/ob.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2012-12-20 14:15:43 +0100
committerMichael Albinus <michael.albinus@gmx.de>2012-12-20 14:15:43 +0100
commit006faa4118a335844583d73d9fbd2a844e908b2f (patch)
treede2cd82503274ed8e9a676d90ccbcc0151b1da9f /lisp/org/ob.el
parent91b982a0355d6eff74f7d9df56d5b321b13d2f8a (diff)
downloademacs-006faa4118a335844583d73d9fbd2a844e908b2f.tar.gz
emacs-006faa4118a335844583d73d9fbd2a844e908b2f.tar.bz2
emacs-006faa4118a335844583d73d9fbd2a844e908b2f.zip
* ob.el (org-babel-temp-file): Fix setting of
`temporary-file-directory' on remote hosts. * ob-eval.el (org-babel-shell-command-on-region): Use `process-file' instead of `call-process-region'. The latter one does not work on remote hosts.
Diffstat (limited to 'lisp/org/ob.el')
-rw-r--r--lisp/org/ob.el14
1 files changed, 5 insertions, 9 deletions
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index b06aac11f69..32ca7c6ca9e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -2547,18 +2547,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."