From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 7 Jan 2020 12:10:35 +0000 (+0100)
Subject: * lisp/net/tramp.el (tramp-file-local-name): Remove `save-match-data'.
X-Git-Tag: emacs-27.0.90~203
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=883b3490d8;p=emacs.git

* lisp/net/tramp.el (tramp-file-local-name): Remove `save-match-data'.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 52c6a9ec430..e0013def5d0 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1339,14 +1339,14 @@ entry does not exist, return nil."
   "Return the local name component of NAME.
 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.  NAME must be
-a string that matches `tramp-file-name-regexp'.  The returned
-file name can be used directly as argument of `process-file',
-`start-file-process', or `shell-command'."
-  (save-match-data
-    (and (tramp-tramp-file-p name)
-         (string-match (nth 0 tramp-file-name-structure) name)
-         (match-string (nth 4 tramp-file-name-structure) name))))
+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'."
+  (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))
 
 (defun tramp-find-method (method user host)
   "Return the right method string to use depending on USER and HOST.