procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/net/tramp.el
View file

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