procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):

Browse source 
Remove test messages.
(tramp-do-copy-or-rename-file-out-of-band): Do not quote `source'
and `target' twice.
This commit is contained in:
Michael Albinus 2014-04-22 12:43:01 +02:00
parent 84b2095cba
commit 14828a9567
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2014-04-22 Michael Albinus <michael.albinus@gmx.de>
* 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 <monnier@iro.umontreal.ca>
* dframe.el (dframe-get-focus): Remove `hook' argument (bug#17311).

13
lisp/net/tramp-sh.el
View file

@ -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