diff options
| author | Michael Albinus | 2014-04-13 12:31:48 +0200 |
|---|---|---|
| committer | Michael Albinus | 2014-04-13 12:31:48 +0200 |
| commit | f2d164a4c6f3f0eb6f175b57012738aeaad2f294 (patch) | |
| tree | 348cdbababaa62377ddec9c83be877d640f2eca4 | |
| parent | 498d3768d1109a9bee2aa0207e63db79800627eb (diff) | |
| download | emacs-f2d164a4c6f3f0eb6f175b57012738aeaad2f294.tar.gz emacs-f2d164a4c6f3f0eb6f175b57012738aeaad2f294.zip | |
* net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous
patch, there are new problems with file names containing spaces.
Get rid of backticks. (Bug#17238)
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f08a133d98..6099f31d636 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-04-13 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous | ||
| 4 | patch, there are new problems with file names containing spaces. | ||
| 5 | Get rid of backticks. (Bug#17238) | ||
| 6 | |||
| 1 | 2014-04-13 João Távora <joaotavora@gmail.com> | 7 | 2014-04-13 João Távora <joaotavora@gmail.com> |
| 2 | 8 | ||
| 3 | * elec-pair.el (electric-pair--syntax-ppss): Simplify and fix | 9 | * elec-pair.el (electric-pair--syntax-ppss): Simplify and fix |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 4d0b5ae54d4..3b600e3d84e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -950,15 +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. | ||
| 954 | ((tramp-get-remote-readlink v) | 953 | ((tramp-get-remote-readlink v) |
| 955 | (setq result | 954 | (tramp-send-command-and-check |
| 956 | (tramp-send-command-and-read | 955 | v |
| 957 | v | 956 | (format "%s --canonicalize-missing %s" |
| 958 | (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" | 957 | (tramp-get-remote-readlink v) |
| 959 | (tramp-get-remote-readlink v) | 958 | (tramp-shell-quote-argument localname))) |
| 960 | (tramp-shell-quote-argument | 959 | (with-current-buffer (tramp-get-connection-buffer v) |
| 961 | (tramp-shell-quote-argument localname)))))) | 960 | (goto-char (point-min)) |
| 961 | (setq result (buffer-substring (point-min) (point-at-eol))))) | ||
| 962 | 962 | ||
| 963 | ;; Use Perl implementation. | 963 | ;; Use Perl implementation. |
| 964 | ((and (tramp-get-remote-perl v) | 964 | ((and (tramp-get-remote-perl v) |