From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 18 Oct 2015 11:22:02 +0000 (+0200)
Subject: Some minor Tramp changes
X-Git-Tag: emacs-25.0.90~1095
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c75616af01286eb7df1ae646c77071255bb25f7;p=emacs.git

Some minor Tramp changes

* doc/misc/tramp.texi (Obtaining Tramp): Add http git cloning.

* lisp/net/tramp.el (tramp-handle-make-auto-save-file-name):
Expand `tramp-auto-save-directory'.
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 8658f6f81a7..8673b00b23d 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -428,6 +428,14 @@ Or follow the example session below:
 ] @strong{git clone git://git.savannah.gnu.org/tramp.git}
 @end example
 
+@noindent
+If you reside behind a firewall, you could use
+
+@example
+] @strong{git config --global http.proxy http://user:pwd@@proxy.server.com:8080}
+] @strong{git clone http://git.savannah.gnu.org/r/tramp.git}
+@end example
+
 @noindent
 Tramp developers use instead
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 15af0b548ae..75fa9b6d4d0 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4048,6 +4048,9 @@ Return the local name of the temporary file."
   "Like `make-auto-save-file-name' for Tramp files.
 Returns a file name in `tramp-auto-save-directory' for autosaving
 this file, if that variable is non-nil."
+  (when (stringp tramp-auto-save-directory)
+    (setq tramp-auto-save-directory
+	  (expand-file-name tramp-auto-save-directory)))
   ;; Create directory.
   (unless (or (null tramp-auto-save-directory)
 	      (file-exists-p tramp-auto-save-directory))