emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-24 r117002: * net/tramp-sh.el (tramp-sh-handle-file-


From: Michael Albinus
Subject: [Emacs-diffs] emacs-24 r117002: * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
Date: Tue, 22 Apr 2014 10:43:07 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117002
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-22 12:43:01 +0200
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-21 21:43:17 +0000
+++ b/lisp/ChangeLog    2014-04-22 10:43:01 +0000
@@ -1,3 +1,10 @@
+2014-04-22  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dframe.el (dframe-get-focus): Remove `hook' argument (bug#17311).

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-04-21 21:04:25 +0000
+++ b/lisp/net/tramp-sh.el      2014-04-22 10:43:01 +0000
@@ -1725,15 +1725,6 @@
                                 '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 @@
 
            ;; 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 @@
                                  (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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]