[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117200: Fix Bug#17653.
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-24 r117200: Fix Bug#17653. |
Date: |
Tue, 03 Jun 2014 07:43:41 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117200
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17653
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-06-03 09:43:24 +0200
message:
Fix Bug#17653.
* net/tramp.el (tramp-ssh-controlmaster-options): Improve search regexp.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/tramp.el tramp.el-20091113204419-o5vbwnq5f7feedwu-2427
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-06-03 04:41:20 +0000
+++ b/lisp/ChangeLog 2014-06-03 07:43:24 +0000
@@ -1,3 +1,8 @@
+2014-06-03 Michael Albinus <address@hidden>
+
+ * net/tramp.el (tramp-ssh-controlmaster-options): Improve search
+ regexp. (Bug#17653)
+
2014-06-03 Glenn Morris <address@hidden>
* emacs-lisp/package.el (package-pinned-packages): Doc fix.
=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-04-18 18:57:04 +0000
+++ b/lisp/net/tramp.el 2014-06-03 07:43:24 +0000
@@ -302,18 +302,19 @@
;;;###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 address@hidden:%%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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117200: Fix Bug#17653.,
Michael Albinus <=