From 50f3811883c7082b3c2a5a10bcfe77a3adfcb6ff Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 2 Feb 2015 10:16:04 +0100 Subject: net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" Fixes: debbugs:19702 * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for ControlPath if possible. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 24 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc42bcecc9c..8ef533e1aa6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-02 Michael Albinus + + * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for + ControlPath if possible. (Bug#19702) + 2015-02-02 Glenn Morris * emacs-lisp/authors.el (authors-obsolete-files-regexps) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 3afb487ec3d..c442806b90f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -311,17 +311,25 @@ useful only in combination with `tramp-default-proxies-alist'.") (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.+argument" nil t) - (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto"))) - (unless (zerop (length result)) + (when (executable-find "ssh") (with-temp-buffer - (call-process "ssh" nil t nil "-o" "ControlPersist") + (call-process "ssh" nil t nil "-o" "ControlMaster") (goto-char (point-min)) (when (search-forward-regexp "missing.+argument" nil t) - (setq result (concat result " -o ControlPersist=no")))))) + (setq result "-o ControlMaster=auto"))) + (unless (zerop (length result)) + (with-temp-buffer + (call-process + "ssh" nil t nil "-o" "ControlPath=%C" "host.does.not.exist") + (goto-char (point-min)) + (if (search-forward-regexp "unknown.+key" nil t) + (setq result (concat result " -o ControlPath=%t.%%r@%%h:%%p")) + (setq result (concat result " -o ControlPath=%t.%%C")))) + (with-temp-buffer + (call-process "ssh" nil t nil "-o" "ControlPersist") + (goto-char (point-min)) + (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. Return a string to be used in `tramp-methods'.") -- cgit v1.2.1 From d6fee01589a0f10b3d761bd9bdf582730c92a171 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 3 Feb 2015 10:32:00 +0100 Subject: Tramp: Don't use a tempfile for ControlPath. Fixes: debbugs:19702 * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a tempfile for ControlPath. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ef533e1aa6..a61c2403dd3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-03 Michael Albinus + + * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a + tempfile for ControlPath. (Bug#19702) + 2015-02-02 Michael Albinus * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c442806b90f..b746bca5804 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -323,8 +323,9 @@ useful only in combination with `tramp-default-proxies-alist'.") "ssh" nil t nil "-o" "ControlPath=%C" "host.does.not.exist") (goto-char (point-min)) (if (search-forward-regexp "unknown.+key" nil t) - (setq result (concat result " -o ControlPath=%t.%%r@%%h:%%p")) - (setq result (concat result " -o ControlPath=%t.%%C")))) + (setq result + (concat result " -o ControlPath=tramp.%%r@%%h:%%p")) + (setq result (concat result " -o ControlPath=tramp.%%C")))) (with-temp-buffer (call-process "ssh" nil t nil "-o" "ControlPersist") (goto-char (point-min)) -- cgit v1.2.1 From 4e8d586076f412b9dfe43241e455a7c76b117020 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 3 Feb 2015 10:42:13 +0100 Subject: Fix last commit --- lisp/net/tramp.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index b746bca5804..2e1fe69460a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -324,8 +324,8 @@ useful only in combination with `tramp-default-proxies-alist'.") (goto-char (point-min)) (if (search-forward-regexp "unknown.+key" nil t) (setq result - (concat result " -o ControlPath=tramp.%%r@%%h:%%p")) - (setq result (concat result " -o ControlPath=tramp.%%C")))) + (concat result " -o ControlPath='tramp.%%r@%%h:%%p'")) + (setq result (concat result " -o ControlPath='tramp.%%C'")))) (with-temp-buffer (call-process "ssh" nil t nil "-o" "ControlPersist") (goto-char (point-min)) -- cgit v1.2.1 From ec26c23f4815fbc6bbd16d20f400721bc7b58344 Mon Sep 17 00:00:00 2001 From: Nicolas Petton Date: Wed, 4 Feb 2015 01:11:13 +0100 Subject: authors.el: Add missing ignored and renamed files * emacs-lisp/authors.el (authors-ignored-files) (authors-renamed-files-alist): Additions. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/authors.el | 2 ++ 2 files changed, 7 insertions(+) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a61c2403dd3..e52f9a35b47 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-04 Nicolas Petton + + * emacs-lisp/authors.el (authors-ignored-files) + (authors-renamed-files-alist): Additions. + 2015-02-03 Michael Albinus * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 762b0a3a2f5..b44f7aa7146 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -354,6 +354,7 @@ Changes to files matching one of the regexps in this list are not listed.") "All" "Version" "Everywhere" "Many" "Various" "files" ;; Directories. "vms" "mac" "url" "tree-widget" + "info/dir" ) "List of files and directories to ignore. Changes to files in this list are not listed.") @@ -779,6 +780,7 @@ in the repository.") ("play/bruce.el" . "bruce.el") ("play/yow.el" . "yow.el") ("patcomp.el" . "patcomp.el") + ("emulation/ws-mode.el" . "ws-mode.el") ;; From lisp to etc/forms. ("forms-d2.el" . "forms-d2.el") ("forms-pass.el" . "forms-pass.el") -- cgit v1.2.1