summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2016-08-07 13:57:23 +0200
committerKyle Meyer <kyle@kyleam.com>2016-09-18 11:10:41 -0400
commitf46b92df92f2c8202164b86b3a1ddee936ee2d4b (patch)
tree4f0f1f5e3c893e50a282bfc16d43906e0e5ab87e
parent5977aa7fc211f7132e9dd717eda53d753bb2d159 (diff)
downloadorg-mode-f46b92df92f2c8202164b86b3a1ddee936ee2d4b.tar.gz
Backport commit 2c05061 from Emacs
* lisp/ob-core.el (org-babel-local-file-name): Use `file-remote-p'. Add `make-nearby-temp-file' and `temporary-file-directory' 2c0506173d92dd9d6de409a045668c6b5cf1fcef Michael Albinus Sun Aug 7 13:57:23 2016 +0200
-rw-r--r--lisp/ob-core.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 2617c13..014c5e9 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -48,11 +48,6 @@
(declare-function org-mark-ring-push "org" (&optional pos buffer))
(declare-function tramp-compat-make-temp-file "tramp-compat"
(filename &optional dir-flag))
-(declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
-(declare-function tramp-file-name-user "tramp" (vec))
-(declare-function tramp-file-name-host "tramp" (vec))
-(declare-function with-parsed-tramp-file-name "tramp" (filename var &rest body)
- t)
(declare-function org-icompleting-read "org" (&rest args))
(declare-function org-edit-src-code "org-src" (&optional code edit-buffer-name))
(declare-function org-edit-src-exit "org-src" ())
@@ -2965,7 +2960,7 @@ character of the string."
(start end program &optional delete buffer display &rest args)
"Use Tramp to handle `call-process-region'.
Fixes a bug in `tramp-handle-call-process-region'."
- (if (and (featurep 'tramp) (file-remote-p default-directory))
+ (if (file-remote-p default-directory)
(let ((tmpfile (tramp-compat-make-temp-file "")))
(write-region start end tmpfile)
(when delete (delete-region start end))