Merge from origin/emacs-24

ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed  (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
	lisp/ChangeLog
	src/ChangeLog
	src/xdisp.c

2 files changed, 38 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db1358cd2fe..8083fb85cea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2015-03-03  Nicolas Petton  <nicolas@petton.fr>
+
+        * emacs-lisp/authors.el (authors-ignored-files)
+        (authors-renamed-files-alist): Additions.
+
+2015-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-ssh-controlmaster-options): Don't use a
+        tempfile for ControlPath.  (Bug#19702)
+
+2015-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-ssh-controlmaster-options): Use "%C" for
+        ControlPath if possible.  (Bug#19702)
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/authors.el (authors-obsolete-files-regexps)
+        (authors-valid-file-names, authors-renamed-files-alist): Additions.
+
+2015-03-03  Alan Mackenzie  <acm@muc.de>
 2015-03-03  Alan Mackenzie  <acm@muc.de>
 
         CC Mode: Stop Font Lock forcing fontification from BOL.  Fixes
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index ba0d13eab8b..a03affa5eeb 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -311,17 +311,26 @@ 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='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))
+            (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'.")