[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 216c6aa: * net/tramp-sh.el (tramp-do-copy-or-rena
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-24 216c6aa: * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): |
Date: |
Wed, 24 Dec 2014 08:59:05 +0000 |
branch: emacs-24
commit 216c6aadf22bfb9d209b6ce9a469499fd6e1b78f
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
* 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.
---
lisp/ChangeLog | 5 +++++
lisp/net/tramp-sh.el | 8 +++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 789f59e..2272812 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-24 Michael Albinus <address@hidden>
+
+ * 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 <address@hidden>
* 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 a78d101..444c9a7 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 216c6aa: * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):,
Michael Albinus <=