summaryrefslogtreecommitdiff
path: root/lisp/net/tramp.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2019-12-29 13:53:06 +0100
committerMichael Albinus <michael.albinus@gmx.de>2019-12-29 13:53:06 +0100
commitd6922db49dea33ac2bca8b33d24763cc7b2e4cd7 (patch)
treeafb4f75d73cbfb59abb4d3553b51aa10578328f3 /lisp/net/tramp.el
parent70fe552c61eaf36801c2b8691379315098df13e4 (diff)
downloademacs-d6922db49dea33ac2bca8b33d24763cc7b2e4cd7.tar.gz
emacs-d6922db49dea33ac2bca8b33d24763cc7b2e4cd7.tar.bz2
emacs-d6922db49dea33ac2bca8b33d24763cc7b2e4cd7.zip
Sync with Tramp 2.4.3
* doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.4.3". * lisp/net/tramp.el: Bump version. (tramp-handle-shell-command): The temp file for error-buffer is remote. * test/lisp/net/tramp-tests.el (tramp-test30-make-process): Simplify buffer generation. (tramp-test32-shell-command): Extend test.
Diffstat (limited to 'lisp/net/tramp.el')
-rw-r--r--lisp/net/tramp.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 36bfe5ef865..cf39aa5ddd4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -7,8 +7,9 @@
;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Package: tramp
-;; Version: 2.4.3-pre
+;; Version: 2.4.3
;; Package-Requires: ((emacs "24.4"))
+;; Package-Type: multi
;; URL: https://savannah.gnu.org/projects/tramp
;; This file is part of GNU Emacs.
@@ -3681,7 +3682,9 @@ support symbolic links."
(setq buffer (if (and (not asynchronous) error-buffer)
(with-parsed-tramp-file-name default-directory nil
- (list output-buffer (tramp-make-tramp-temp-file v)))
+ (list output-buffer
+ (tramp-make-tramp-file-name
+ v (tramp-make-tramp-temp-file v))))
output-buffer))
(if current-buffer-p
@@ -3735,7 +3738,7 @@ support symbolic links."
(defun tramp-handle-start-file-process (name buffer program &rest args)
"Like `start-file-process' for Tramp files."
- ;; `make-process' knows the `:file-error' argument since Emacs 27.1.
+ ;; `make-process' knows the `:file-handler' argument since Emacs 27.1 only.
(tramp-file-name-handler
'make-process
:name name