From: Alex Bochannek <alex@bochannek.com>
Date: Fri, 23 Jul 2021 18:29:59 +0000 (+0200)
Subject: Fix bug#49699
X-Git-Tag: emacs-28.0.90~1733
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb20d013a1717a0ecc6ee3563e69261aaf7c98eb;p=emacs.git

Fix bug#49699

* lisp/net/tramp-sh.el (tramp-scp-strict-file-name-checking):
Adapt check for macOS.  (Bug#49699)
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 8b4c78fe65b..f94508303df 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4782,7 +4782,9 @@ Goes through the list `tramp-inline-compress-commands'."
 	      (with-temp-buffer
 		(tramp-call-process vec "scp" nil t nil "-T")
 		(goto-char (point-min))
-		(unless (search-forward-regexp "unknown option -- T" nil t)
+		(unless
+                    (search-forward-regexp
+                     "\\(illegal\\|unknown\\) option -- T" nil t)
 		  (setq tramp-scp-strict-file-name-checking "-T")))))))
       tramp-scp-strict-file-name-checking)))