diff options
| author | Michael Albinus | 2021-07-12 15:49:50 +0200 |
|---|---|---|
| committer | Michael Albinus | 2021-07-12 15:49:50 +0200 |
| commit | bfd159539f112785ed215cfd2abb2e2e1f2ea1f6 (patch) | |
| tree | b920e24721a9789dce76ae26cc092ff81c52d5af | |
| parent | a79c578f3d77101964b837e8fa8b8109f21c7a88 (diff) | |
| download | emacs-bfd159539f112785ed215cfd2abb2e2e1f2ea1f6.tar.gz emacs-bfd159539f112785ed215cfd2abb2e2e1f2ea1f6.zip | |
Fix a problem with tramp-*-process-file
* lisp/net/tramp-adb.el (tramp-adb-handle-process-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-process-file):
* lisp/net/tramp-smb.el (tramp-smb-handle-process-file):
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file):
Use `(expand-file-name default-directory)'.
| -rw-r--r-- | lisp/net/tramp-adb.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-sshfs.el | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 63fd5eb06a3..dbbbfe6a3f9 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el | |||
| @@ -803,7 +803,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 803 | (when (and (numberp destination) (zerop destination)) | 803 | (when (and (numberp destination) (zerop destination)) |
| 804 | (error "Implementation does not handle immediate return")) | 804 | (error "Implementation does not handle immediate return")) |
| 805 | 805 | ||
| 806 | (with-parsed-tramp-file-name default-directory nil | 806 | (with-parsed-tramp-file-name (expand-file-name default-directory) nil |
| 807 | (let (command input tmpinput stderr tmpstderr outbuf ret) | 807 | (let (command input tmpinput stderr tmpstderr outbuf ret) |
| 808 | ;; Compute command. | 808 | ;; Compute command. |
| 809 | (setq command (mapconcat #'tramp-shell-quote-argument | 809 | (setq command (mapconcat #'tramp-shell-quote-argument |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e5929bd366a..3595bd26557 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -3029,7 +3029,7 @@ implementation will be used." | |||
| 3029 | (when (and (numberp destination) (zerop destination)) | 3029 | (when (and (numberp destination) (zerop destination)) |
| 3030 | (error "Implementation does not handle immediate return")) | 3030 | (error "Implementation does not handle immediate return")) |
| 3031 | 3031 | ||
| 3032 | (with-parsed-tramp-file-name default-directory nil | 3032 | (with-parsed-tramp-file-name (expand-file-name default-directory) nil |
| 3033 | (let (command env uenv input tmpinput stderr tmpstderr outbuf ret) | 3033 | (let (command env uenv input tmpinput stderr tmpstderr outbuf ret) |
| 3034 | ;; Compute command. | 3034 | ;; Compute command. |
| 3035 | (setq command (mapconcat #'tramp-shell-quote-argument | 3035 | (setq command (mapconcat #'tramp-shell-quote-argument |
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index d3de0455dd0..1c7ddee0086 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -1259,7 +1259,7 @@ component is used as the target of the symlink." | |||
| 1259 | (when (and (numberp destination) (zerop destination)) | 1259 | (when (and (numberp destination) (zerop destination)) |
| 1260 | (error "Implementation does not handle immediate return")) | 1260 | (error "Implementation does not handle immediate return")) |
| 1261 | 1261 | ||
| 1262 | (with-parsed-tramp-file-name default-directory nil | 1262 | (with-parsed-tramp-file-name (expand-file-name default-directory) nil |
| 1263 | (let* ((name (file-name-nondirectory program)) | 1263 | (let* ((name (file-name-nondirectory program)) |
| 1264 | (name1 name) | 1264 | (name1 name) |
| 1265 | (i 0) | 1265 | (i 0) |
diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el index f4872cef10c..5f6807a0db7 100644 --- a/lisp/net/tramp-sshfs.el +++ b/lisp/net/tramp-sshfs.el | |||
| @@ -235,7 +235,7 @@ arguments to pass to the OPERATION." | |||
| 235 | (when (and (numberp destination) (zerop destination)) | 235 | (when (and (numberp destination) (zerop destination)) |
| 236 | (error "Implementation does not handle immediate return")) | 236 | (error "Implementation does not handle immediate return")) |
| 237 | 237 | ||
| 238 | (with-parsed-tramp-file-name default-directory nil | 238 | (with-parsed-tramp-file-name (expand-file-name default-directory) nil |
| 239 | (let ((command | 239 | (let ((command |
| 240 | (format | 240 | (format |
| 241 | "cd %s && exec %s" | 241 | "cd %s && exec %s" |