1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00

* 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.
This commit is contained in:
Michael Albinus 2014-12-24 09:58:49 +01:00
parent 20cfd2480d
commit 216c6aadf2
2 changed files with 8 additions and 5 deletions

View File

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

View File

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