diff options
| author | Michael Albinus | 2015-10-18 13:22:02 +0200 |
|---|---|---|
| committer | Michael Albinus | 2015-10-18 13:22:02 +0200 |
| commit | 1c75616af01286eb7df1ae646c77071255bb25f7 (patch) | |
| tree | fb810f5577cbdf52855bc5878b936acf63f4c70d | |
| parent | 1d378c0b9b105ffe6710411ef01b6a9b8cc2a21d (diff) | |
| download | emacs-1c75616af01286eb7df1ae646c77071255bb25f7.tar.gz emacs-1c75616af01286eb7df1ae646c77071255bb25f7.zip | |
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'.
| -rw-r--r-- | doc/misc/tramp.texi | 8 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 3 |
2 files changed, 11 insertions, 0 deletions
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 | |||
| @@ -429,6 +429,14 @@ Or follow the example session below: | |||
| 429 | @end example | 429 | @end example |
| 430 | 430 | ||
| 431 | @noindent | 431 | @noindent |
| 432 | If you reside behind a firewall, you could use | ||
| 433 | |||
| 434 | @example | ||
| 435 | ] @strong{git config --global http.proxy http://user:pwd@@proxy.server.com:8080} | ||
| 436 | ] @strong{git clone http://git.savannah.gnu.org/r/tramp.git} | ||
| 437 | @end example | ||
| 438 | |||
| 439 | @noindent | ||
| 432 | Tramp developers use instead | 440 | Tramp developers use instead |
| 433 | 441 | ||
| 434 | @example | 442 | @example |
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." | |||
| 4048 | "Like `make-auto-save-file-name' for Tramp files. | 4048 | "Like `make-auto-save-file-name' for Tramp files. |
| 4049 | Returns a file name in `tramp-auto-save-directory' for autosaving | 4049 | Returns a file name in `tramp-auto-save-directory' for autosaving |
| 4050 | this file, if that variable is non-nil." | 4050 | this file, if that variable is non-nil." |
| 4051 | (when (stringp tramp-auto-save-directory) | ||
| 4052 | (setq tramp-auto-save-directory | ||
| 4053 | (expand-file-name tramp-auto-save-directory))) | ||
| 4051 | ;; Create directory. | 4054 | ;; Create directory. |
| 4052 | (unless (or (null tramp-auto-save-directory) | 4055 | (unless (or (null tramp-auto-save-directory) |
| 4053 | (file-exists-p tramp-auto-save-directory)) | 4056 | (file-exists-p tramp-auto-save-directory)) |