From 14828a9567be2acf2af9f52938174a2281684099 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 22 Apr 2014 12:43:01 +0200 Subject: [PATCH] * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): Remove test messages. (tramp-do-copy-or-rename-file-out-of-band): Do not quote `source' and `target' twice. --- lisp/ChangeLog | 7 +++++++ lisp/net/tramp-sh.el | 13 +------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 169e6bce49d..a2cd739a53d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-04-22 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): + Remove test messages. + (tramp-do-copy-or-rename-file-out-of-band): Do not quote `source' + and `target' twice. + 2014-04-21 Stefan Monnier * dframe.el (dframe-get-focus): Remove `hook' argument (bug#17311). diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ac57cbb2780..9c86c8c48bd 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1725,15 +1725,6 @@ be non-negative integers." 'completion-ignore-case)) 1 0))) - (tramp-message v 1 "Tramp test: %s" (tramp-get-ls-command v)) - (tramp-send-command - v - (format "\\cd %s 2>&1 && %s %s -a 2>/dev/null" - (tramp-shell-quote-argument localname) - (tramp-get-ls-command v) - (if (zerop (length filename)) - "." - (concat (tramp-shell-quote-argument filename) "* -d")))) (format (concat "(\\cd %s 2>&1 && (%s %s -a 2>/dev/null" ;; `ls' with wildcard might fail with `Argument @@ -1765,7 +1756,6 @@ be non-negative integers." ;; Now grab the output. (with-current-buffer (tramp-get-buffer v) - (tramp-message v 1 "Tramp test: %s" (buffer-string)) (goto-char (point-max)) ;; Check result code, found in last line of output. @@ -2371,8 +2361,7 @@ The method used must be an out-of-band method." (append copy-args (list - (shell-quote-argument source) - (shell-quote-argument target) + source target "&&" "echo" "tramp_exit_status" "0" "||" "echo" "tramp_exit_status" "1")))))) (tramp-message -- 2.11.4.GIT