mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 10:27:41 +00:00
Fix some annoyances wrt file-name-non-special
* lisp/files.el (file-name-non-special): Do not expand `file-truename'. * lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use local `default-directory' for `start-process'.
This commit is contained in:
parent
3ad239e1bc
commit
f50577ea07
2 changed files with 10 additions and 6 deletions
|
|
@ -7559,7 +7559,10 @@ only these files will be asked to be saved."
|
|||
(setq file-arg-indices (cdr file-arg-indices))))
|
||||
(pcase method
|
||||
('identity (car arguments))
|
||||
('add (file-name-quote (apply operation arguments) t))
|
||||
('add
|
||||
;; This is `file-truename'. We don't want file name handlers
|
||||
;; to expand this.
|
||||
(file-name-quote (let (tramp-mode) (apply operation arguments)) t))
|
||||
('buffer-file-name
|
||||
(let ((buffer-file-name (file-name-unquote buffer-file-name t)))
|
||||
(apply operation arguments)))
|
||||
|
|
|
|||
|
|
@ -2371,11 +2371,12 @@ The method used must be an out-of-band method."
|
|||
;; can be handled. We don't set a timeout, because
|
||||
;; the copying of large files can last longer than 60
|
||||
;; secs.
|
||||
p (apply
|
||||
#'start-process
|
||||
(tramp-get-connection-name v)
|
||||
(tramp-get-connection-buffer v)
|
||||
copy-program copy-args))
|
||||
p (let ((default-directory (tramp-compat-temporary-file-directory)))
|
||||
(apply
|
||||
#'start-process
|
||||
(tramp-get-connection-name v)
|
||||
(tramp-get-connection-buffer v)
|
||||
copy-program copy-args)))
|
||||
(tramp-message orig-vec 6 "%s" (string-join (process-command p) " "))
|
||||
(process-put p 'vector orig-vec)
|
||||
(process-put p 'adjust-window-size-function #'ignore)
|
||||
|
|
|
|||
Loading…
Reference in a new issue