* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):

Use `tramp-rsh-end-of-line', it ought to be more robust.

2 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 789f59e1b42..22728121a15 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-24  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+        Use `tramp-rsh-end-of-line', it ought to be more robust.
+
 2014-12-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/js.el (js-syntax-propertize): "return" can't be divided
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index a78d101e3c1..444c9a73052 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2456,11 +2456,9 @@ The method used must be an out-of-band method."
                   (tramp-set-connection-property p "vector" orig-vec)
                   (tramp-compat-set-process-query-on-exit-flag p nil)
 
-                  ;; When `shell-file-name' is "cmdproxy", we must adapt
-                  ;; `tramp-local-end-of-line' for sending the password.
-                  (let ((tramp-local-end-of-line
-                         (if (string-match "cmdproxy" shell-file-name)
-                             "\n" tramp-local-end-of-line)))
+                  ;; We must adapt `tramp-local-end-of-line' for
+                  ;; sending the password.
+                  (let ((tramp-local-end-of-line tramp-rsh-end-of-line))
                     (tramp-process-actions
                      p v nil tramp-actions-copy-out-of-band))