diff options
| author | Glenn Morris | 2014-04-12 12:24:17 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-04-12 12:24:17 -0700 |
| commit | e0af409500d5f44b34a6e8d971f0c7abe1d747fe (patch) | |
| tree | da8c3218399660418391a9bc35d955aa4ff07c73 /lisp/net | |
| parent | 3197074e49162f96a6eb33ca45fbbfddcf1ae01a (diff) | |
| parent | 5121b6923beb2fb62b179b4a95b07f9feb969f3d (diff) | |
| download | emacs-e0af409500d5f44b34a6e8d971f0c7abe1d747fe.tar.gz emacs-e0af409500d5f44b34a6e8d971f0c7abe1d747fe.zip | |
Merge from emacs-24; up to 2014-04-07T20:54:16Z!dancol@dancol.org
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8ff29a8b426..4d0b5ae54d4 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -950,13 +950,15 @@ target of the symlink differ." | |||
| 950 | (tramp-message v 4 "Finding true name for `%s'" filename) | 950 | (tramp-message v 4 "Finding true name for `%s'" filename) |
| 951 | (cond | 951 | (cond |
| 952 | ;; Use GNU readlink --canonicalize-missing where available. | 952 | ;; Use GNU readlink --canonicalize-missing where available. |
| 953 | ;; We must quote the file name twice due to the backticks. | ||
| 953 | ((tramp-get-remote-readlink v) | 954 | ((tramp-get-remote-readlink v) |
| 954 | (setq result | 955 | (setq result |
| 955 | (tramp-send-command-and-read | 956 | (tramp-send-command-and-read |
| 956 | v | 957 | v |
| 957 | (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" | 958 | (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" |
| 958 | (tramp-get-remote-readlink v) | 959 | (tramp-get-remote-readlink v) |
| 959 | (tramp-shell-quote-argument localname))))) | 960 | (tramp-shell-quote-argument |
| 961 | (tramp-shell-quote-argument localname)))))) | ||
| 960 | 962 | ||
| 961 | ;; Use Perl implementation. | 963 | ;; Use Perl implementation. |
| 962 | ((and (tramp-get-remote-perl v) | 964 | ((and (tramp-get-remote-perl v) |