Fix Bug#17653.

* net/tramp.el (tramp-ssh-controlmaster-options): Improve search regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc9703db3e077bd53ea3b10070dcd7f8b73dc474..d73300523e95a319ef181fbef85d8ff67786fca9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-03  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-ssh-controlmaster-options): Improve search
+       regexp.  (Bug#17653)
+
 2014-06-03  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/package.el (package-pinned-packages): Doc fix.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6cc8275b327747c759d66a2d844f5dad653883d5..9a97d82452879fdb0a62770afd9d6cc2c9f7b35e 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -302,18 +302,19 @@ useful only in combination with `tramp-default-proxies-alist'.")
 
 ;;;###tramp-autoload
 (defconst tramp-ssh-controlmaster-options
-  (let ((result ""))
+  (let ((result "")
+       (case-fold-search t))
     (ignore-errors
       (with-temp-buffer
        (call-process "ssh" nil t nil "-o" "ControlMaster")
        (goto-char (point-min))
-       (when (search-forward-regexp "Missing ControlMaster argument" nil t)
+       (when (search-forward-regexp "missing.+argument" nil t)
          (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto")))
-      (when result
+      (unless (zerop (length result))
        (with-temp-buffer
          (call-process "ssh" nil t nil "-o" "ControlPersist")
          (goto-char (point-min))
-         (when (search-forward-regexp "Missing ControlPersist argument" nil t)
+         (when (search-forward-regexp "missing.+argument" nil t)
            (setq result (concat result " -o ControlPersist=no"))))))
     result)
     "Call ssh to detect whether it supports the Control* arguments.