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

4 files changed, 80 insertions, 65 deletions

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 59d389dc630..0069c1744dc 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -992,7 +992,14 @@ command with a prefix argument (the value does not matter)."
           (ignore-errors (dired-remove-entry new-file))
           (goto-char start)
           ;; Now replace the current line with an entry for NEW-FILE.
-          (dired-update-file-line new-file) nil)
+          ;; But don't remove the current line if either FROM-FILE or
+          ;; NEW-FILE is a directory, because compressing/uncompressing
+          ;; directories doesn't remove the original.
+          (if (or (file-directory-p from-file)
+                  (file-directory-p new-file))
+              (dired-add-entry new-file nil t)
+            (dired-update-file-line new-file))
+          nil)
       (dired-log (concat "Failed to (un)compress " from-file))
       from-file)))
 
@@ -1020,8 +1027,9 @@ command with a prefix argument (the value does not matter)."
     ("\\.7z\\'" "" "7z x -aoa -o%o %i")
     ;; This item controls naming for compression.
     ("\\.tar\\'" ".tgz" nil)
-    ;; This item controls the compression of directories
-    (":" ".tar.gz" "tar -cf - %i | gzip -c9 > %o"))
+    ;; This item controls the compression of directories.  Its REGEXP
+    ;; element should never match any valid file name.
+    ("\000" ".tar.gz" "tar -cf - %i | gzip -c9 > %o"))
   "Control changes in file name suffixes for compression and uncompression.
 Each element specifies one transformation rule, and has the form:
   (REGEXP NEW-SUFFIX PROGRAM)
@@ -1145,7 +1153,7 @@ Return nil if no change in files."
            (condition-case nil
                (if (file-directory-p file)
                    (progn
-                     (setq suffix (cdr (assoc ":" dired-compress-file-suffixes)))
+                     (setq suffix (cdr (assoc "\000" dired-compress-file-suffixes)))
                      (when suffix
                        (let ((out-name (concat file (car suffix)))
                              (default-directory (file-name-directory file)))
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)
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 9c8c7ab56f5..97037dea6e8 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -45,6 +45,7 @@
 (cc-bytecomp-defvar imenu-case-fold-search)
 (cc-bytecomp-defvar imenu-generic-expression)
 (cc-bytecomp-defvar imenu-create-index-function)
+(cc-bytecomp-defun c-literal-limits)
 
 
 ;; imenu integration
@@ -437,55 +438,56 @@ Example:
     (goto-char (point-max))
     ;;
     (while (re-search-backward cc-imenu-objc-generic-expression nil t)
-      (setq langnum (if (match-beginning OBJC)
-                        OBJC
-                      (cond
-                       ((match-beginning Cproto) Cproto)
-                       ((match-beginning Cgeneralfunc) Cgeneralfunc)
-                       ((match-beginning Cnoreturn) Cnoreturn))))
-      (setq str (funcall func (match-beginning langnum) (match-end langnum)))
-      ;;
-      (cond
-       ;;
-       ;; C
-       ;;
-       ((not (eq langnum OBJC))
-        (setq clist (cons (cons str (match-beginning langnum)) clist)))
-       ;;
-       ;; ObjC
-       ;;
-       ;; An instance Method
-       ((eq (aref str 0) ?-)
-        (setq str (concat "-" (cc-imenu-objc-method-to-selector str)))
-        (setq methodlist (cons (cons str
-                              (match-beginning langnum))
-                        methodlist)))
-       ;; A factory Method
-       ((eq (aref str 0) ?+)
-        (setq str (concat "+" (cc-imenu-objc-method-to-selector str)))
-        (setq methodlist (cons (cons str
-                              (match-beginning langnum))
-                        methodlist)))
-       ;; Interface or implementation or protocol
-       ((eq (aref str 0) ?@)
-        (setq classcount (1+ classcount))
+      (when (not (c-literal-limits))
+        (setq langnum (if (match-beginning OBJC)
+                          OBJC
+                        (cond
+                         ((match-beginning Cproto) Cproto)
+                         ((match-beginning Cgeneralfunc) Cgeneralfunc)
+                         ((match-beginning Cnoreturn) Cnoreturn))))
+        (setq str (funcall func (match-beginning langnum) (match-end langnum)))
+        ;;
         (cond
-         ((and (> (length str) implen)
-               (string= (substring  str 0 implen) "@implementation"))
-          (setq str (substring str implen)
-                str2 "@implementation"))
-         ((string= (substring  str 0 intflen) "@interface")
-          (setq str (substring str intflen)
-                str2 "@interface"))
-         ((string= (substring  str 0 prtlen) "@protocol")
-          (setq str (substring str prtlen)
-                str2 "@protocol")))
-        (setq str (cc-imenu-objc-remove-white-space str))
-        (setq methodlist (cons (cons str2
-                                     (match-beginning langnum))
-                               methodlist))
-        (setq toplist (cons (cons str methodlist) toplist)
-              methodlist nil))))
+         ;;
+         ;; C
+         ;;
+         ((not (eq langnum OBJC))
+          (setq clist (cons (cons str (match-beginning langnum)) clist)))
+         ;;
+         ;; ObjC
+         ;;
+         ;; An instance Method
+         ((eq (aref str 0) ?-)
+          (setq str (concat "-" (cc-imenu-objc-method-to-selector str)))
+          (setq methodlist (cons (cons str
+                                       (match-beginning langnum))
+                                 methodlist)))
+         ;; A factory Method
+         ((eq (aref str 0) ?+)
+          (setq str (concat "+" (cc-imenu-objc-method-to-selector str)))
+          (setq methodlist (cons (cons str
+                                       (match-beginning langnum))
+                                 methodlist)))
+         ;; Interface or implementation or protocol
+         ((eq (aref str 0) ?@)
+          (setq classcount (1+ classcount))
+          (cond
+           ((and (> (length str) implen)
+                 (string= (substring  str 0 implen) "@implementation"))
+            (setq str (substring str implen)
+                  str2 "@implementation"))
+           ((string= (substring  str 0 intflen) "@interface")
+            (setq str (substring str intflen)
+                  str2 "@interface"))
+           ((string= (substring  str 0 prtlen) "@protocol")
+            (setq str (substring str prtlen)
+                  str2 "@protocol")))
+          (setq str (cc-imenu-objc-remove-white-space str))
+          (setq methodlist (cons (cons str2
+                                       (match-beginning langnum))
+                                 methodlist))
+          (setq toplist (cons (cons str methodlist) toplist)
+                methodlist nil)))))
 
     ;; In this buffer, there is only one or zero @{interface|implementation|protocol}.
     (if (< classcount 2)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index a8ca6f8fbec..4fbcd08506b 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1218,6 +1218,9 @@ IGNORES is a list of glob patterns for files to ignore."
   #'xref-matches-in-directory
   "27.1")
 
+(declare-function tramp-tramp-file-p "tramp")
+(declare-function tramp-file-local-name "tramp")
+
 ;;;###autoload
 (defun xref-matches-in-files (regexp files)
   "Find all matches for REGEXP in FILES.
@@ -1240,7 +1243,12 @@ FILES must be a list of absolute file names."
                           "")
                         (shell-quote-argument (xref--regexp-to-extended regexp)))))
     (when remote-id
-      (setq files (mapcar #'file-local-name files)))
+      (require 'tramp)
+      (setq files (mapcar
+                   (if (tramp-tramp-file-p dir)
+                       #'tramp-file-local-name
+                       #'file-local-name)
+                   files)))
     (with-current-buffer output
       (erase-buffer)
       (with-temp-buffer