diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-04-10 09:17:40 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-04-10 09:17:40 +0200 |
| commit | bcbb83a92d3a65f0c724a043836a8c60aa09f57c (patch) | |
| tree | e6e47b431dda28dd118337a3f794d3a851fb2151 /lisp/net/tramp-sh.el | |
| parent | 0cccc183d7530d342e7970f4544cdf70e3327cb6 (diff) | |
| download | emacs-bcbb83a92d3a65f0c724a043836a8c60aa09f57c.tar.gz emacs-bcbb83a92d3a65f0c724a043836a8c60aa09f57c.tar.bz2 emacs-bcbb83a92d3a65f0c724a043836a8c60aa09f57c.zip | |
* net/tramp.el (tramp-file-name-handler)
(tramp-completion-file-name-handler): Avoid recursive loading.
* net/tramp-sh.el (tramp-make-copy-program-file-name):
Quote result also locally.
Diffstat (limited to 'lisp/net/tramp-sh.el')
| -rw-r--r-- | lisp/net/tramp-sh.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 22ea7714743..8ff29a8b426 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4836,9 +4836,10 @@ Return ATTR." (host (tramp-file-name-real-host vec)) (localname (tramp-shell-quote-argument (tramp-file-name-localname vec)))) - (if (not (zerop (length user))) - (format "%s@%s:%s" user host localname) - (format "%s:%s" host localname)))) + (shell-quote-argument + (if (not (zerop (length user))) + (format "%s@%s:%s" user host localname) + (format "%s:%s" host localname))))) (defun tramp-method-out-of-band-p (vec size) "Return t if this is an out-of-band method, nil otherwise." |