diff options
| author | Michael Albinus | 2010-05-04 10:44:47 +0200 |
|---|---|---|
| committer | Michael Albinus | 2010-05-04 10:44:47 +0200 |
| commit | c04b03f8d5bd6eb66d07bce08202faa16c083dc5 (patch) | |
| tree | b85a65344dc5523383ade52a9c0d7546c3817b91 | |
| parent | 58eb6cf0f77547d29f4fddca922eb6f98c0ffb28 (diff) | |
| download | emacs-c04b03f8d5bd6eb66d07bce08202faa16c083dc5.tar.gz emacs-c04b03f8d5bd6eb66d07bce08202faa16c083dc5.zip | |
* net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args'
in order to see error messages for failed logins.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 18 |
2 files changed, 16 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cc1bddaca2..11648ed1abd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-04 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-methods): Remove "-q" from `tramp-login-args' | ||
| 4 | in order to see error messages for failed logins. | ||
| 5 | |||
| 1 | 2010-05-03 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-05-03 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * diff.el (diff-sentinel): | 8 | * diff.el (diff-sentinel): |
| @@ -98,7 +103,7 @@ | |||
| 98 | (ede-dired-minor-mode): Use define-minor-mode and derived-mode-p. | 103 | (ede-dired-minor-mode): Use define-minor-mode and derived-mode-p. |
| 99 | (ede-dired-add-to-target): Use dolist. | 104 | (ede-dired-add-to-target): Use dolist. |
| 100 | 105 | ||
| 101 | 2010-05-01 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com> | 106 | 2010-05-01 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com> |
| 102 | Michael Albinus <michael.albinus@gmx.de> | 107 | Michael Albinus <michael.albinus@gmx.de> |
| 103 | 108 | ||
| 104 | Implement compression for inline methods. | 109 | Implement compression for inline methods. |
| @@ -109,7 +114,7 @@ | |||
| 109 | (tramp-find-inline-compress, tramp-get-inline-compress) | 114 | (tramp-find-inline-compress, tramp-get-inline-compress) |
| 110 | (tramp-get-inline-coding): New defuns. | 115 | (tramp-get-inline-coding): New defuns. |
| 111 | (tramp-get-remote-coding, tramp-get-local-coding): Remove, | 116 | (tramp-get-remote-coding, tramp-get-local-coding): Remove, |
| 112 | replace by `tramp-get-inline-coding'. | 117 | replaced by `tramp-get-inline-coding'. |
| 113 | (tramp-handle-file-local-copy, tramp-handle-write-region) | 118 | (tramp-handle-file-local-copy, tramp-handle-write-region) |
| 114 | (tramp-method-out-of-band-p): Use `tramp-get-inline-coding'. | 119 | (tramp-method-out-of-band-p): Use `tramp-get-inline-coding'. |
| 115 | 120 | ||
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a385efa2c01..9852b62ff00 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -332,7 +332,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 332 | (tramp-copy-recursive t) | 332 | (tramp-copy-recursive t) |
| 333 | (tramp-password-end-of-line nil)) | 333 | (tramp-password-end-of-line nil)) |
| 334 | ("scp" (tramp-login-program "ssh") | 334 | ("scp" (tramp-login-program "ssh") |
| 335 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 335 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 336 | ("-e" "none"))) | 336 | ("-e" "none"))) |
| 337 | (tramp-remote-sh "/bin/sh") | 337 | (tramp-remote-sh "/bin/sh") |
| 338 | (tramp-copy-program "scp") | 338 | (tramp-copy-program "scp") |
| @@ -347,7 +347,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 347 | ("-o" "StrictHostKeyChecking=no"))) | 347 | ("-o" "StrictHostKeyChecking=no"))) |
| 348 | (tramp-default-port 22)) | 348 | (tramp-default-port 22)) |
| 349 | ("scp1" (tramp-login-program "ssh") | 349 | ("scp1" (tramp-login-program "ssh") |
| 350 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 350 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 351 | ("-1" "-e" "none"))) | 351 | ("-1" "-e" "none"))) |
| 352 | (tramp-remote-sh "/bin/sh") | 352 | (tramp-remote-sh "/bin/sh") |
| 353 | (tramp-copy-program "scp") | 353 | (tramp-copy-program "scp") |
| @@ -362,7 +362,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 362 | ("-o" "StrictHostKeyChecking=no"))) | 362 | ("-o" "StrictHostKeyChecking=no"))) |
| 363 | (tramp-default-port 22)) | 363 | (tramp-default-port 22)) |
| 364 | ("scp2" (tramp-login-program "ssh") | 364 | ("scp2" (tramp-login-program "ssh") |
| 365 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 365 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 366 | ("-2" "-e" "none"))) | 366 | ("-2" "-e" "none"))) |
| 367 | (tramp-remote-sh "/bin/sh") | 367 | (tramp-remote-sh "/bin/sh") |
| 368 | (tramp-copy-program "scp") | 368 | (tramp-copy-program "scp") |
| @@ -447,7 +447,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 447 | (tramp-copy-keep-date nil) | 447 | (tramp-copy-keep-date nil) |
| 448 | (tramp-password-end-of-line nil)) | 448 | (tramp-password-end-of-line nil)) |
| 449 | ("ssh" (tramp-login-program "ssh") | 449 | ("ssh" (tramp-login-program "ssh") |
| 450 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 450 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 451 | ("-e" "none"))) | 451 | ("-e" "none"))) |
| 452 | (tramp-remote-sh "/bin/sh") | 452 | (tramp-remote-sh "/bin/sh") |
| 453 | (tramp-copy-program nil) | 453 | (tramp-copy-program nil) |
| @@ -460,7 +460,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 460 | ("-o" "StrictHostKeyChecking=no"))) | 460 | ("-o" "StrictHostKeyChecking=no"))) |
| 461 | (tramp-default-port 22)) | 461 | (tramp-default-port 22)) |
| 462 | ("ssh1" (tramp-login-program "ssh") | 462 | ("ssh1" (tramp-login-program "ssh") |
| 463 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 463 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 464 | ("-1" "-e" "none"))) | 464 | ("-1" "-e" "none"))) |
| 465 | (tramp-remote-sh "/bin/sh") | 465 | (tramp-remote-sh "/bin/sh") |
| 466 | (tramp-copy-program nil) | 466 | (tramp-copy-program nil) |
| @@ -473,7 +473,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 473 | ("-o" "StrictHostKeyChecking=no"))) | 473 | ("-o" "StrictHostKeyChecking=no"))) |
| 474 | (tramp-default-port 22)) | 474 | (tramp-default-port 22)) |
| 475 | ("ssh2" (tramp-login-program "ssh") | 475 | ("ssh2" (tramp-login-program "ssh") |
| 476 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 476 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 477 | ("-2" "-e" "none"))) | 477 | ("-2" "-e" "none"))) |
| 478 | (tramp-remote-sh "/bin/sh") | 478 | (tramp-remote-sh "/bin/sh") |
| 479 | (tramp-copy-program nil) | 479 | (tramp-copy-program nil) |
| @@ -535,7 +535,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 535 | (tramp-copy-keep-date nil) | 535 | (tramp-copy-keep-date nil) |
| 536 | (tramp-password-end-of-line nil)) | 536 | (tramp-password-end-of-line nil)) |
| 537 | ("scpc" (tramp-login-program "ssh") | 537 | ("scpc" (tramp-login-program "ssh") |
| 538 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 538 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 539 | ("-o" "ControlPath=%t.%%r@%%h:%%p") | 539 | ("-o" "ControlPath=%t.%%r@%%h:%%p") |
| 540 | ("-o" "ControlMaster=yes") | 540 | ("-o" "ControlMaster=yes") |
| 541 | ("-e" "none"))) | 541 | ("-e" "none"))) |
| @@ -552,7 +552,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 552 | ("-o" "StrictHostKeyChecking=no"))) | 552 | ("-o" "StrictHostKeyChecking=no"))) |
| 553 | (tramp-default-port 22)) | 553 | (tramp-default-port 22)) |
| 554 | ("scpx" (tramp-login-program "ssh") | 554 | ("scpx" (tramp-login-program "ssh") |
| 555 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 555 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 556 | ("-e" "none" "-t" "-t" "/bin/sh"))) | 556 | ("-e" "none" "-t" "-t" "/bin/sh"))) |
| 557 | (tramp-remote-sh "/bin/sh") | 557 | (tramp-remote-sh "/bin/sh") |
| 558 | (tramp-copy-program "scp") | 558 | (tramp-copy-program "scp") |
| @@ -565,7 +565,7 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 565 | ("-o" "StrictHostKeyChecking=no"))) | 565 | ("-o" "StrictHostKeyChecking=no"))) |
| 566 | (tramp-default-port 22)) | 566 | (tramp-default-port 22)) |
| 567 | ("sshx" (tramp-login-program "ssh") | 567 | ("sshx" (tramp-login-program "ssh") |
| 568 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") ("-q") | 568 | (tramp-login-args (("%h") ("-l" "%u") ("-p" "%p") |
| 569 | ("-e" "none" "-t" "-t" "/bin/sh"))) | 569 | ("-e" "none" "-t" "-t" "/bin/sh"))) |
| 570 | (tramp-remote-sh "/bin/sh") | 570 | (tramp-remote-sh "/bin/sh") |
| 571 | (tramp-copy-program nil) | 571 | (tramp-copy-program nil) |