summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorAlex Bochannek <alex@bochannek.com>2021-07-23 20:29:59 +0200
committerMichael Albinus <michael.albinus@gmx.de>2021-07-23 20:29:59 +0200
commiteb20d013a1717a0ecc6ee3563e69261aaf7c98eb (patch)
tree1cc55c255c38c3a4fbd26a9e89354da8a006624d /lisp
parent6ce2acdadb7467fbde01f3d0648acea158836614 (diff)
downloademacs-eb20d013a1717a0ecc6ee3563e69261aaf7c98eb.tar.gz
emacs-eb20d013a1717a0ecc6ee3563e69261aaf7c98eb.tar.bz2
emacs-eb20d013a1717a0ecc6ee3563e69261aaf7c98eb.zip
Fix bug#49699
* lisp/net/tramp-sh.el (tramp-scp-strict-file-name-checking): Adapt check for macOS. (Bug#49699)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp-sh.el4
1 files changed, 3 insertions, 1 deletions
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)))