1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

Further enhancement on `tramp-file-local-name'

* lisp/net/tramp.el (tramp-file-local-name): Call `file-local-name'
if NAME is not a Tramp file name.
This commit is contained in:
Michael Albinus 2020-01-08 09:54:04 +01:00
parent fb432446f5
commit af5709f16b

View File

@ -1330,8 +1330,7 @@ entry does not exist, return nil."
t))
;; This function bypasses the file name handler approach. It is NOT
;; recommended to use it in any package if not absolutely necessary,
;; because it won't work for remote file names not supported by Tramp.
;; recommended to use it in any package if not absolutely necessary.
;; However, it is more performant than `file-local-name', and might be
;; useful where performance matters, like in operations over a bulk
;; list of file names.
@ -1340,13 +1339,13 @@ entry does not exist, return nil."
This function removes from NAME the specification of the remote
host and the method of accessing the host, leaving only the part
that identifies NAME locally on the remote system. If NAME does
not match `tramp-file-name-regexp', just NAME is returned. The
returned file name can be used directly as argument of
`process-file', `start-file-process', or `shell-command'."
not match `tramp-file-name-regexp', just `file-local-name' is
called. The returned file name can be used directly as argument
of `process-file', `start-file-process', or `shell-command'."
(or (and (tramp-tramp-file-p name)
(string-match (nth 0 tramp-file-name-structure) name)
(match-string (nth 4 tramp-file-name-structure) name))
name))
(tramp-compat-file-local-name name)))
(defun tramp-find-method (method user host)
"Return the right method string to use depending on USER and HOST.