diff options
| author | Michael Albinus | 2019-12-29 13:53:06 +0100 |
|---|---|---|
| committer | Michael Albinus | 2019-12-30 18:55:39 +0100 |
| commit | 248c5e103d61af4352e2c8d9b810babdd4cd6ddf (patch) | |
| tree | 46d9a74882b02f3069888eff457535db4cd64696 /lisp | |
| parent | 90083b7d78df1b8a054f3028cc9eb8c55a632b1e (diff) | |
| download | emacs-248c5e103d61af4352e2c8d9b810babdd4cd6ddf.tar.gz emacs-248c5e103d61af4352e2c8d9b810babdd4cd6ddf.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.
(cherry picked from commit d6922db49dea33ac2bca8b33d24763cc7b2e4cd7)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp.el | 9 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
2 files changed, 8 insertions, 5 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 @@ | |||
| 7 | ;; Maintainer: Michael Albinus <michael.albinus@gmx.de> | 7 | ;; Maintainer: Michael Albinus <michael.albinus@gmx.de> |
| 8 | ;; Keywords: comm, processes | 8 | ;; Keywords: comm, processes |
| 9 | ;; Package: tramp | 9 | ;; Package: tramp |
| 10 | ;; Version: 2.4.3-pre | 10 | ;; Version: 2.4.3 |
| 11 | ;; Package-Requires: ((emacs "24.4")) | 11 | ;; Package-Requires: ((emacs "24.4")) |
| 12 | ;; Package-Type: multi | ||
| 12 | ;; URL: https://savannah.gnu.org/projects/tramp | 13 | ;; URL: https://savannah.gnu.org/projects/tramp |
| 13 | 14 | ||
| 14 | ;; This file is part of GNU Emacs. | 15 | ;; This file is part of GNU Emacs. |
| @@ -3681,7 +3682,9 @@ support symbolic links." | |||
| 3681 | 3682 | ||
| 3682 | (setq buffer (if (and (not asynchronous) error-buffer) | 3683 | (setq buffer (if (and (not asynchronous) error-buffer) |
| 3683 | (with-parsed-tramp-file-name default-directory nil | 3684 | (with-parsed-tramp-file-name default-directory nil |
| 3684 | (list output-buffer (tramp-make-tramp-temp-file v))) | 3685 | (list output-buffer |
| 3686 | (tramp-make-tramp-file-name | ||
| 3687 | v (tramp-make-tramp-temp-file v)))) | ||
| 3685 | output-buffer)) | 3688 | output-buffer)) |
| 3686 | 3689 | ||
| 3687 | (if current-buffer-p | 3690 | (if current-buffer-p |
| @@ -3735,7 +3738,7 @@ support symbolic links." | |||
| 3735 | 3738 | ||
| 3736 | (defun tramp-handle-start-file-process (name buffer program &rest args) | 3739 | (defun tramp-handle-start-file-process (name buffer program &rest args) |
| 3737 | "Like `start-file-process' for Tramp files." | 3740 | "Like `start-file-process' for Tramp files." |
| 3738 | ;; `make-process' knows the `:file-error' argument since Emacs 27.1. | 3741 | ;; `make-process' knows the `:file-handler' argument since Emacs 27.1 only. |
| 3739 | (tramp-file-name-handler | 3742 | (tramp-file-name-handler |
| 3740 | 'make-process | 3743 | 'make-process |
| 3741 | :name name | 3744 | :name name |
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 49eab7fbc86..9c04b6110eb 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | (defvar inhibit-message) | 39 | (defvar inhibit-message) |
| 40 | 40 | ||
| 41 | ;;;###tramp-autoload | 41 | ;;;###tramp-autoload |
| 42 | (defconst tramp-version "2.4.3-pre" | 42 | (defconst tramp-version "2.4.3" |
| 43 | "This version of Tramp.") | 43 | "This version of Tramp.") |
| 44 | 44 | ||
| 45 | ;;;###tramp-autoload | 45 | ;;;###tramp-autoload |
| @@ -73,7 +73,7 @@ | |||
| 73 | ;; Check for Emacs version. | 73 | ;; Check for Emacs version. |
| 74 | (let ((x (if (not (string-lessp emacs-version "24.4")) | 74 | (let ((x (if (not (string-lessp emacs-version "24.4")) |
| 75 | "ok" | 75 | "ok" |
| 76 | (format "Tramp 2.4.3-pre is not fit for %s" | 76 | (format "Tramp 2.4.3 is not fit for %s" |
| 77 | (replace-regexp-in-string "\n" "" (emacs-version)))))) | 77 | (replace-regexp-in-string "\n" "" (emacs-version)))))) |
| 78 | (unless (string-equal "ok" x) (error "%s" x))) | 78 | (unless (string-equal "ok" x) (error "%s" x))) |
| 79 | 79 | ||