From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 4 Feb 2022 05:30:30 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~2539
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0260f0fe2f10c414afbbf484978149808f42f53;p=emacs.git

Merge from origin/emacs-28

0591aa6cd3 Revert an erroneous change in tramp-cache.el
---

e0260f0fe2f10c414afbbf484978149808f42f53
diff --cc lisp/net/tramp-cache.el
index 1ab8f4d335b,d35f7ffa4e3..dc1e3d28b58
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@@ -122,9 -125,9 +122,9 @@@ If KEY is `tramp-cache-undefined', don'
  	       (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 'nohop))
 +		     (tramp-make-tramp-file-name key 'noloc))
  		(tramp-set-connection-property key (nth 1 elt) (nth 2 elt)))))
  	  hash))))