Merge from origin/emacs-27

6cd9ccb0a2 (origin/emacs-27) Fix compression of directories in Dired
42329e6d3b ; * etc/NEWS: Review of the whole text.
af5709f16b Further enhancement on `tramp-file-local-name'
fb432446f5 Objective C Mode imenu: cease recognizing "functions" with...
a18373a999 ; * etc/NEWS: Update the text about the XDG_CONFIG_HOME/em...
73fd8a4b53 Fix BSD and macOS builds w.r.t. pthread_setname_np (bug#38...
f54b24304d Scale top-left coordinates in display-monitor-attributes-list
b46c75b16c xref-matches-in-files: Big Tramp speed-up
883b3490d8 * lisp/net/tramp.el (tramp-file-local-name): Remove `save-...
c01f55f126 Fix rendering bug due to unsynchronized cairo surface size...
075f21c0e3 Avoid crash by access to cleared img->pixmap->data/img->ma...
16c6dfb4f1 Avoid assertion violations in very small-height windows
9063124b91 Use pthread_setname_np to set thread name

# Conflicts:
#	etc/NEWS
#	lisp/net/tramp.el

1 files changed, 9 insertions, 12 deletions

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 22bac9ce459..a7c9b34d29d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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.
@@ -1339,16 +1338,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'.  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'."
-  (save-match-data
-    (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)))
+that identifies NAME locally on the remote system.  If NAME does
+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))
+      (tramp-compat-file-local-name name)))
 
 ;; The localname can be quoted with "/:".  Extract this.
 (defun tramp-unquote-file-local-name (name)