master e0260f0fe2: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit e0260f0fe2f10c414afbbf484978149808f42f53
Merge: a42df6542a 0591aa6cd3
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    0591aa6cd3 Revert an erroneous change in tramp-cache.el
---
 lisp/net/tramp-cache.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 1ab8f4d335..dc1e3d28b5 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -122,7 +122,7 @@ If KEY is `tramp-cache-undefined', don't create anything, 
and return nil."
               (puthash key (make-hash-table :test #'equal) tramp-cache-data)))
          (when (tramp-file-name-p key)
            (dolist (elt tramp-connection-properties)
-             (when (tramp-compat-string-search
+             (when (string-match-p
                     (or (nth 0 elt) "")
                     (tramp-make-tramp-file-name key 'noloc))
                (tramp-set-connection-property key (nth 1 elt) (nth 2 elt)))))